updating mentordeliver.xml with new values
Merge branch 'master' of github.com:avanhel/paparazzi

Conflicts:
	sw/ground_segment/misc/CV3F2ivy