Added changes to composer
--
Merge remote-tracking branch 'upstream/master'

Conflicts:
	composer.lock
Empty commit- fixing merge
Attempt merge

Merge remote-tracking branch 'origin/master'

Conflicts:
	composer.lock