before merge
Merge branch 'master' of https://github.com/Factor-X/awac

Conflicts:
	app/eu/factorx/awac/angular/controllers/UserDataCtrl.coffee
	app/eu/factorx/awac/angular/directives/awac/mmAwacModalEmailChange/directive.coffee
Achieved implementation of user profile management form