Merge branch 'develop'
updated composer
updated version numbers
Merge branch 'develop'

Conflicts:
	composer.json
Merge branch 'develop' of git://github.com/sulu-cmf/SuluSearchBundle
bumped version