Merge remote-tracking branch 'origin/development'
Test composer.json #1
Test composer.json #2
Merge remote-tracking branch 'origin/master' into development

Conflicts:
	composer.json