Merge origin/testBranch into testBranch

Conflicts:
	CLEI/src/Comite.py