Interfacage

ALignements activité COLIS
Thibault arrete de travailler
Merge branch 'Save'

Conflicts:
	src/project.properties
Merge branch 'master' of https://github.com/thibautpalier/JollyJumper

Conflicts:
	src/project.properties