Merge branch 'allen'
Adding color resources and some changes to Room buttons.
Merge branch 'prakhar'
Merge branch 'master' of https://github.com/ZihaoAllen/PennApps2013
Merge branch 'master' into allen