corrected service definition
Merge pull request #50 from sulu-cmf/bugfix/resolver

[BUGFIX] Added twig variables at correct place
implemented cache clear button
Merge branch 'develop' of git://github.com/sulu-cmf/SuluWebsiteBundle into bugfix/exclude-test-pages
Merge branch 'develop' of git://github.com/sulu-cmf/SuluWebsiteBundle into feature/remove-global-state
Merge branch 'feature/remove-global-state' into develop
corected test templates
fixed bug
corrected tests
adapted tests and fixes breadcrumb generation
Merge branch 'bugfix/exclude-test-pages' of git://github.com/sulu-cmf/SuluWebsiteBundle into bugfix/exclude-test-pages
corrected tests
Merge branch 'feature/remove-global-state' into develop
added test cases for not existing uuid
fixed redeclare bug
Merge branch 'develop' of git://github.com/sulu-cmf/SuluContentBundle into bugfix/resource-locator-validation
fixed translations
Merge branch 'bugfix/resource-locator-validation' into develop
Merge branch 'develop' of git://github.com/sulu-cmf/SuluContentBundle into develop
Merge branch 'develop' of git://github.com/sulu-cmf/SuluContentBundle into bugfix/preview-new-node

Conflicts:
	Resources/public/dist/components/content/main.js