adding unit tests for UserService, MenuService and MenuCtrl
adding tests for the Userservice and menu controller - last commit left these files out
Merge branch 'develop' into feature/ui-router

Conflicts:
	www/js/controllers/menuctrl.js