local change
Merge branch 'master' of https://github.com/dimpu/Angular-Chatter

Conflicts:
	source/js/app/modules/auth/directives/uniqueEmailDirective.js
	source/js/app/modules/auth/views/register.html