https://github.com/massiveart/POOL-ALPIN/issues/145
Merge branch 'hotfix/request-locale'
updated version number
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
Merge branch 'develop' of git://github.com/sulu-cmf/sulu into bugfix/Navigation-update
Merge pull request #508 from sulu-cmf/bugfix/Navigation-update

 [BUGFIX] Fixed navigation behaviour if clicking on the user name on the navigation side bar
fixed cached data bug
added testcase
added changelog
Merge pull request #509 from sulu-cmf/hotfix/smart-content-cached-data

Fixed cached data bug in smart-content
hotfix [media] Updated media assets
Merge pull request #521 from sulu-cmf/hotfix/updated-media-assets

hotfix [media] Updated media assets
hotfix [media] Updated media assets
Added new query for supplier related media
Code cleanup
Merge pull request #525 from sulu-cmf/feature/mediaquery

[FEATURE] Added new query for supplier related media
Updated version number
Merge remote-tracking branch 'origin/master' into develop

Conflicts:
	composer.json
	src/Sulu/Bundle/ContentBundle/Content/Types/SmartContent/SmartContent.php
removed version numbers
Merge branch 'develop' of git://github.com/sulu-cmf/sulu into feature/get-all-localized-urls

Conflicts:
	CHANGELOG.md