Composer
Merge branch 'dev'

Conflicts:
	composer.json