Composer.json testing
Merge branch 'master' of https://github.com/Alexandre-T/cerbere.git

Conflicts:
	composer.json