updates to support new apptimizer rewrites
Merge branch 'dev' of github.com:campuscolors/campuscolors into dev