Merge branch 'hotfix/blocks'
updated composer version
added preview controller test
implemented fail test case
fixed error for html5 entities
implemented invalid html test and added logger for xml errors
fixed homepage language changer
fixed test cases
Merge branch 'hotfix/html5-tags'
updated composer version
added object to array conversion
Merge pull request #184 from sulu-cmf/hotfix/single-block

[HOTFIX] added object to array conversion to handle single block
updated version number
Merge branch 'master' of git://github.com/sulu-cmf/SuluContentBundle
Merge branch 'master' into develop

Conflicts:
	Resources/public/dist/components/content/main.js
	composer.json