fixed
fixed
Merge branch 'hotfix/content-type' into develop
Merge branch 'develop' of git://github.com/sulu-cmf/SuluMediaBundle into develop

Conflicts:
	Resources/public/dist/components/media-selection/main.js