Merge branch 'hotfix/block-issues'
updated composer json
Merge branch 'master' into develop

Conflicts:
	composer.json