Merge master into version-JavaGangstazz

Conflicts:
	ResortUI/src/main/java/org/thomasmore/oo3/course/resortui/controller/ProfileController.java
	ResortUI/src/main/webapp/common/template.xhtml
	ResortUI/src/main/webapp/profile.xhtml