ajout du jersey
Merge branch 'master' of https://github.com/TriComp/TriComp

Conflicts:
	interface/mainwindow.cpp