Updates controller to use search_index.tpl template
Merge remote-tracking branch 'origin/master'

Conflicts:
	Controller/SearchController.php