update composer data
Merge branch 'master' into release

Conflicts:
	public/composer.json
update for release branch