minor
Merge branch 'master' of github.com:CICIC/gestioCI_butterfly_release

Conflicts:
	Project Context/readme.html