added search functionality
Merge branch 'master' of https://github.com/silentr/meetthecity

Conflicts:
	app/controllers/Application.java
	conf/routes