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
Merge branch 'develop' of git://github.com/sulu-cmf/SuluContentBundle into feature/move-node

Conflicts:
	Resources/public/dist/components/content/main.js
added special case for object to array conversion
fixed #185
fixed #179
fixed resource locator type
fixed typo
removed index from index navigation item
added full response for save node
fixed active theme in preview
added reset template if cancel
fixed config
adapted version number
Merge branch 'feature/move-node' into develop
Merge branch 'hotfix/loader' into develop

Conflicts:
	composer.json
fixed tests