Revert "Merge origin/master into version-teamAwesome"

This reverts commit 0a4c7d7d007e6fe953cad67cf518ebf6237a7862.
Revert "Merge origin/master into version-teamAwesome"

This reverts commit 04daf499211126a710b52c8195a9352ab40ec54b.
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