Merge branch 'hotfix/invalid-tempalte'
updated composer.json
Merge branch 'master' into develop

Conflicts:
	composer.json