new search structure
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/java/org/ayfaar/app/controllers/NewSearchController.java