UI color changes
Merge branch 'master' of https://github.com/drewswu/BadassCMS

Conflicts:
	skin/layout.haml
Merge branch 'master' of https://github.com/drewswu/BadassCMS
Merge branch 'master' of https://github.com/drewswu/BadassCMS
Merge branch 'master' of https://github.com/drewswu/BadassCMS
Merge branch 'master' of https://github.com/drewswu/BadassCMS
Merge branch 'master' of https://github.com/drewswu/BadassCMS
Merge branch 'master' of https://github.com/drewswu/BadassCMS
Merge branch 'master' of https://github.com/drewswu/BadassCMS
Merge branch 'master' of https://github.com/drewswu/BadassCMS
Merging this, bitches!
trying to fix crash