little changes

Conflicts:

	share-a-flat/src/main/java/ch/unibe/ese2014/team4/controller/service/AdService.java