Correction des dépendances
Merge branch 'master' into elastic

Conflicts:
	composer.lock
	composer.phar
	etc/common/build.properties
	src/composer.json
	src/composer.lock