Merge branch 'hotfix/request-locale'
updated version number
fixed cached data bug
added testcase
Updated README
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
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
Merge pull request #516 from sulu-cmf/updated-readme

Updated README
Update README.md
Merge branch 'develop' of git://github.com/sulu-cmf/sulu into feature/zippedupload