$
Merge branch 'master' of https://github.com/Chrono2013/chrono2.git

Conflicts:
	chrono3/WebContent/test.zul
	chrono3/src/Ctl/gererCtlMVC.java
	chrono3/src/Ctl/gererEvenementCtlMVVM.java