tags done
forgot those
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2014-team8

Conflicts:
	src/main/java/org/sample/model/ShApartment.java
	src/main/webapp/pages/adForms/sharedApartmentForm.jsp