Updated files to match 4.1 upgrade
Merge branch 'master' of https://github.com/SHSWebDesign/SHSWebsite

Merge view changes and Laravel 4.1 file updates