Merge origin/master

Conflicts:
	app/controllers/SearchController.php
	app/forms/SearchForm.php