Merge "Trebuchet CyanogenMod config for Trebuchet Settings in menu" into ics