Updated composer dependencies and bumped versions.
Merge branch 'develop'

Conflicts:
	composer.json