Last minute Changes
Merge remote-tracking branch 'origin/master'

Conflicts:
	Final.mif
	FinalRelocalize.mif