Merge branch 'hotfix/2.0.4'
Added composer.json
Merge branch 'hotfix/2.0.5' into develop