Add customized search page
Merge branch 'master' into custom_search

Conflicts:
	app/views/root/index.html.erb
Add results to custom search page