built new js version
updated composer dependencies
Merge branch 'release/0.4.0'
changed dependencies back to develop
changed back to develop version
Merge branch 'develop' of git://github.com/sulu-cmf/SuluContentBundle into feature/additional-tabs

Conflicts:
	Resources/public/dist/components/content/components/form/main.js