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
Merge pull request #140 from sulu-cmf/feature/node-properties

[FEATURE] node properties (external / internal link)
Added CONTRIBUTING
Merge pull request #173 from sulu-cmf/feature/contributing

Added CONTRIBUTING
Merge branch 'develop' of git://github.com/sulu-cmf/SuluContentBundle into feature/reorder-node
Merge branch 'master' of git://github.com/sulu-cmf/SuluContentBundle into feature/reorder-node

Conflicts:
	Resources/public/dist/components/content/main.js
	composer.json
fixed is array bug smart-content