Merge branch 'hotfix/request-locale'
updated version number
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
bugfix [grunt] Fixed relative paths to web directory
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 'bugfix/fixed-grunt-paths' into develop
enhancement [#] [ContentBundle] Prefix contentbundle template path
Merge pull request #524 from sulu-cmf/enhancement/prefix-content-bundle-template-path

[ContentBundle] Prefix contentbundle template path
feature [#479] Upgrading all functional tests to use minimal configuration
Snippet bundle
TagBundle