Updated dependencies
Merge remote-tracking branch 'origin/0.8'

Conflicts:
	composer.json
	composer.lock
Updated composer.json
Updated dependencies