Merge branch 'develop' of git://github.com/sulu-cmf/SuluTestBundle into feature/content-mapper-internface
Merge branch 'feature/content-mapper-internface' of git://github.com/sulu-cmf/SuluTestBundle into feature/content-mapper-internface