updated composer
Merge commit '3b4bfb4f1a60f67176ddd1a05154fb0901dcc0b2' into develop

Conflicts:
	Alicephp/composer.lock