init media bundle
updated dependencies
update media branch with actual develop
update media bundle from develop branch
Merge branch 'develop' of https://github.com/sulu-cmf/sulu-standard into feature/media-bundle

Conflicts:
	app/admin/AppKernel.php
add routing for media bundle
update media branch from develop
Merge remote-tracking branch 'origin' into feature/media-bundle
add sulumedia upload folder
Merge branch 'develop' of https://github.com/sulu-cmf/sulu-standard into feature/media-bundle
Merge branch 'develop' of https://github.com/sulu-cmf/sulu-standard into feature/media-bundle
merged with develop
added translations
merged with develop
updated dependencies
init extra bundle
Merge branch 'develop' of github.com:sulu-cmf/sulu-standard into develop
updated dependencies, fixed config
fix merge conflicts
adapted translations