Cambios para q funcione!
Merge branch 'master' of https://github.com/eecarres/MissionPlanner

Conflicts:
	Msi/wix.exe
	Msi/wix.pdb