Merge branch 'release/v1.0.4' into develop
update composer.json version
Merge branch 'release/v1.0.5'

Conflicts:
	composer.json