Merge branch 'hotfix/navigation-tree-sort'
updated composer
cleanup block getValue & getContentData
updated block tests
Merge branch 'hotfix/block-data-indexing' into develop

Conflicts:
	composer.json