Merge branch 'develop' of git://github.com/sulu-cmf/sulu into feature/navigation-context
fixed typo
Merge branch 'feature/content-type-debug' of git://github.com/sulu-cmf/sulu into feature/simple-structure
changed nav context defaul to empty array
Merge branch 'feature/navigation-context' of git://github.com/sulu-cmf/sulu into feature/navigation-context

Conflicts:
	src/Sulu/Component/Content/Mapper/ContentMapper.php
changed constructuor default values structure
Merge branch 'feature/navigation-context' into develop
Merge branch 'develop' of git://github.com/sulu-cmf/sulu into feature/simple-structure