Merge branch 'develop' of git://github.com/sulu-cmf/SuluContentBundle into feature/checkbox-content-type
Merge branch 'feature/checkbox-content-type' of git://github.com/sulu-cmf/SuluContentBundle into feature/checkbox-content-type