bungalowEntity aangemaakt
bungalowEntity aangemaakt
bungalowEntity aangemaakt
commit is needed before pulling
commit is needed before pulling2
commit is needed before pulling3
fixed normaal <3
    xmlns:h="http://xmlns.jcp.org/jsf/html"
      xmlns:c="http://xmlns.jcp.org/jsp/jstl/core"> 

in template
Merge origin/version-teamAwesome into version-teamAwesome

Conflicts:
	ResortUI/src/main/java/org/thomasmore/oo3/course/resortui/controller/ProfileController.java
	ResortUI/src/main/java/org/thomasmore/oo3/course/resortui/model/ProfilePageDto.java
	ResortUI/src/main/java/org/thomasmore/oo3/course/resortui/sample/business/entity/BungalowEntity.java
	ResortUI/src/main/webapp/common/template.xhtml
	ResortUI/src/main/webapp/profile.xhtml