Merge branch 'master' into develop
updated composer
updated composer version
bugfix blocks
built files
built files
Merge branch 'develop' of git://github.com/sulu-cmf/SuluContentBundle into hotfix/blocks
bugfix
Merge branch 'develop' of git://github.com/sulu-cmf/SuluContentBundle into hotfix/blocks
Merge branch 'hotfix/blocks' of git://github.com/sulu-cmf/SuluContentBundle into hotfix/blocks
Merge branch 'hotfix/blocks'