tons of changes
Merge branch 'master' of https://github.com/beam018/atproject

Conflicts:
	app/scripts/career/views/careerView.js
	app/scripts/router.js