Rétro UML
Merge remote-tracking branch 'origin/VP-UML'

Conflicts:
	src/Model/Itinary.java