Pushing so I can merge with master
Merge branch 'master' of https://github.com/zwmcfarland/MSEF
Updated styles on some of the school pages
Merge branch 'master' of https://github.com/zwmcfarland/MSEF

Conflicts:
	cakephp-2.5.4/app/View/Schools/add.ctp
Merge branch 'master' of https://github.com/zwmcfarland/MSEF