Readd Trebuchet, and fix build problem
Merge branch 'master' of github.com:FarmGeek4Life/CM-11.0-build