Even more changes to profile
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2014-team4

Conflicts:

	share-a-flat/src/main/java/ch/unibe/ese2014/team4/controller/service/AdServiceImpl.java
	share-a-flat/src/main/java/ch/unibe/ese2014/team4/model/Ad.java
	share-a-flat/src/main/webapp/pages/ad.jsp
Merge branch 'master' of https://github.com/ese-unibe-ch/ese2014-team4