resetted composer
Merge branch 'develop' of git://github.com/sulu-cmf/sulu into develop

Conflicts:
	composer.json