Search by city working
Merge branch 'master' of github.com:ese-unibe-ch/ese2014-team3

Conflicts:
	room4you/src/main/java/ch/room4you/controller/AdController.java
merging