Update composer.json
Merge remote branch 'origin/development-dev' into master2

Conflicts:
	composer.json
Merge branch 'development-dev' of git://github.com/floriansemm/SolrBundle into development-dev2