began with fixing content-type
save
Merge branch 'develop' of git://github.com/sulu-cmf/SuluMediaBundle into feature/content-type
fixed content-type
Merge branch 'feature/content-type' into develop