Added vendor name and version number to composer.json
Merge remote-tracking branch 'origin/develop' into develop

Conflicts:
	composer.json
Merge remote-tracking branch 'upstream/revert-12-develop' into develop

Conflicts:
	composer.json