Development stage
CMP-branch-alias
Dev stage
cp
dEV STG 2
Merge remote-tracking branch 'origin/development' into v1.0

Conflicts:
	composer.json