commit
Merge branch 'master' of https://github.com/hansell/kitchensurfing.git
lsj commit
Merge branch 'master' of https://github.com/hansell/kitchensurfing.git
lsj commit
Merge branch 'master' of https://github.com/hansell/kitchensurfing

Conflicts:
	src/main/webapp/WEB-INF/views/homepage.jsp
	src/main/webapp/WEB-INF/views/userview/account.jsp
	src/main/webapp/WEB-INF/views/userview/settings.jsp