Merge branch 'tyler-2.7-auth' of https://github.com/thortek/dgm4790-spring2014 into tyler-2.7-auth

Conflicts:
	www/js/controllers.js
	www/templates/dean-home.html
Merge branch 'tyler-2.7-auth' of https://github.com/thortek/dgm4790-spring2014 into tyler-2.7-auth

Conflicts:
	www/js/controllers.js
	www/templates/dean-home.html