add user profile page
Merge remote-tracking branch 'origin/development' into development

Conflicts:
	app/src/main/webapp/WEB-INF/spring/appServlet/security.xml