Merge branch 'master' of ssh://git@github.com/friendOfOurs/web-ue-2.git

Conflicts:
	src/main/webapp/start.jsp
Merge remote-tracking branch 'origin/master'
Merge branch 'master' of ssh://git@github.com/friendOfOurs/web-ue-2.git

Conflicts:
	src/main/webapp/start.jsp