fix UserCtrl error
Merge branch 'master' of https://github.com/tskweres/zenmove

Conflicts:
	Scripts/angularZenMove/controllers/UserCtrl.js