Updated README
bugfix [grunt] Fixed relative paths to web directory
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
Refactored DefaultMediaManager
Merge pull request #516 from sulu-cmf/updated-readme

Updated README
Update README.md
Code cleanup
Code cleanup
Merge branch 'develop' of git://github.com/sulu-cmf/sulu into feature/zippedupload
Merge branch 'develop' of git://github.com/sulu-cmf/sulu into feature/get-all-localized-urls

Conflicts:
	CHANGELOG.md