updated NavigationContent
fixed tests
Merge branch 'develop' of git://github.com/sulu-cmf/SuluMediaBundle into feature/content-navigation-refactoring
added group for serialzer
Merge branch 'develop' of git://github.com/sulu-cmf/SuluMediaBundle into feature/api-entities
Merge branch 'master' of git://github.com/sulu-cmf/SuluMediaBundle into develop
updated version numbers
Merge pull request #62 from sulu-cmf/feature/content-navigation-refactoring

[FEATURE] updated NavigationContent
Merge branch 'master' into develop

Conflicts:
	composer.json
throw event after toolbar has initialized
updated content types
Merge branch 'master' into develop
Merge pull request #69 from sulu-cmf/feature/content-restructuring

[FEATURE] Restructured content for Twig template
fixed tests
Merge branch 'develop'
removed cache files
Merge branch 'develop'