working on user update and merge error
Merge branch 'master' of https://github.com/eangeles/wgl

Conflicts:
	js/controllers/LoginController.js