Merge branch 'master' into 1.0
Update README.md
Update composer.json
Merge branch 'master' into 1.0

Conflicts:
	README.md
Bugfix
Merge branch '1.0'