search config
Merge branch 'master' of https://github.com/Majes/SearchBundle

Conflicts:
	Resources/config/config.yml