Build stuff
Merge branch 'master' of https://github.com/carlosfm1989/Tricopter

Conflicts:
	Tri-copter/.settings/language.settings.xml