WIP
Merge branch 'master' of https://github.com/amatissart/innerg

Conflicts:
	innerg-control/src/data/Processing.java
Merge branch 'master' of https://github.com/amatissart/innerg
Mise en place du mouvement de "trajectoire"