javadoc completed
Merge branch 'vetouzAgain'

Conflicts:
	src/Model/Itinary.java