Added composer.json
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	composer.json