code review & cleanup
Merge branch 'feature/mapper' into develop
Merge branch 'develop' of https://github.com/sulu-cmf/sulu into feature/structure

Conflicts:
	src/Sulu/Bundle/CoreBundle/DependencyInjection/SuluCoreExtension.php
	src/Sulu/Component/Content/Mapper/ContentMapper.php