Suchfunktion
Merge branch 'activator' of https://github.com/sthuemm/shop into activator

Conflicts:
	app/controllers/Application.java