updated login controller to use currentUser object
Merge branch 'addisonBranch' of github.com:XYZMedia/shortProject into addisonBranch

Conflicts:
	app/modules/articles/onearticlecontroller.js
	app/modules/user/login/logincontroller.js