xml tests working
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/modele/Plan.java