SALUT
Merge branch 'master' of https://github.com/ruizb/Themis

Conflicts:
	src/common/Utilitaire.java