Merge branch 'feature/cached-url' of git://github.com/sulu-cmf/sulu into feature/request-optimization
cleanup
Merge remote-tracking branch 'origin/feature/request-optimization' into feature/page-refactor

Conflicts:
	src/Sulu/Component/Content/Mapper/ContentMapper.php
	src/Sulu/Component/Content/Query/ContentQueryExecutor.php