Js ..
Merge branch 'master' of github.com:guiben/REPERE

Conflicts:
	prototypes/serveur_repere/test2/preprocess.cpp