new search result page
Merge branch 'master' of https://github.com/b4y/b4y

Conflicts:
	app/controllers/Application.scala
Merge branch 'master' of https://github.com/b4y/b4y

Conflicts:
	app/controllers/Application.scala