Merge pull request #394 from norem/development

Development
fix bad merge
Merge pull request #395 from Kenny9999/development

fix bad merge
Merge remote-tracking branch 'upstream/development' into development
Merge branch 'development' of https://github.com/norem/AeroQuad into development