Merge origin/master into version-teamAwesome

Conflicts:
	ResortUI/nb-configuration.xml
	ResortUI/src/main/java/org/thomasmore/oo3/course/resortui/controller/IndexController.java
	ResortUI/src/main/java/org/thomasmore/oo3/course/resortui/model/ProfilePageDto.java
	ResortUI/src/main/webapp/common/template.xhtml
	ResortUI/src/main/webapp/profile.xhtml
	ResortUI/src/main/webapp/resources/css/default.css