fixed sulu-cmf/sulu-standard#274
Merge branch 'develop' into bugfix/startpage-edit-url
Merge branch 'bugfix/startpage-edit-url' into develop
Merge branch 'develop' of git://github.com/sulu-cmf/SuluContentBundle into develop