Profile page
Merge branch 'feature/profile' into develop

Conflicts:
	conf/routes