Profile Fix
Merge branch 'master' of https://github.com/Symantis/Symantis.org

Conflicts:
	assets/src/app/common/modals/loginModal.tpl.html
	assets/src/app/login/index.js