Ajout du composer
IDE netbeans
Merge origin/master

Conflicts:
	composer.phar
	nbproject/project.properties
	nbproject/project.xml