Merge master into version-JavaGangstazz

Conflicts:
	ResortUI/src/main/java/org/thomasmore/oo3/course/resortui/model/ProfilePageDto.java
	ResortUI/src/main/setup/sun-resources.xml
	ResortUI/src/main/webapp/common/template.xhtml
	ResortUI/src/main/webapp/index.xhtml
	ResortUI/src/main/webapp/profile.xhtml
- Removed all "Sample" mentions from main project.
- Added functionality to add stuff into database.
- Added some more attributes to test database and classes.