a enlever
Merge branch 'master' of https://github.com/CICM/CicmWrapper

Conflicts:
	CreamLibrary/c.library.cpp