bumped version
Merge branch 'release/0.10'

Conflicts:
	composer.json
fixed localization object
Applied CS fixer without docblock param fix
https://github.com/massiveart/POOL-ALPIN/issues/145
Use test workspace for SnippetBundle tests
Merge branch 'hotfix/request-locale' into develop
resetted composer file
Merge pull request #504 from sulu-cmf/do_not_use_default_workspace_for_snippet_bundle

Use test workspace for SnippetBundle tests
Added dot :)
Added dot :)
Merge branch 'csfixer' into develop
Merge branch 'develop' of git://github.com/sulu-cmf/sulu into develop
Added dot :)
Merge branch 'develop' of git://github.com/sulu-cmf/sulu into develop
Merge branch 'develop' of git://github.com/sulu-cmf/sulu into bugfix/Navigation-update

Conflicts:
	src/Sulu/Bundle/AdminBundle/Resources/public/dist/app.min.1414602630381.js
	src/Sulu/Bundle/AdminBundle/Resources/public/dist/app.min.1415096168276.js
	src/Sulu/Bundle/AdminBundle/Resources/public/dist/app.min.1415108332771.js
	src/Sulu/Bundle/AdminBundle/Resources/public/dist/app.min.js
	src/Sulu/Bundle/AdminBundle/Resources/views/Admin/index.html.dist.twig
Upgraded to PhpcrBundle 1.2 and added phpcr-shell to dev
Merge pull request #506 from sulu-cmf/phpcrshell

Upgraded to PhpcrBundle 1.2 and added phpcr-shell to dev
Update CHANGELOG.md
Update CHANGELOG.md