maj "About" blablabla fantalbala
Update Dany
Merge branch 'master' of https://github.com/m2gl-synthlab/synthlab.git

Conflicts:
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/SynthApp.java
	fr.istic.synthlab/src/main/java/fr/istic/synthlab/controller/impl/CModule.java