search fix
rep and tag
Merge branch 'master' of https://github.com/gwenzlau/bklp

Conflicts:
	app/views/pages/search.html.erb