user profile, settings page
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/resources/css/style.css
Merge remote-tracking branch 'origin/master'