Merge pull request #396 from norem/development

Development
Little norem stuff adjustment
Merge pull request #397 from Kenny9999/development

Little norem stuff adjustment
Merge branch 'development' of https://github.com/AeroQuad/AeroQuad into development
Merge branch 'development' of https://github.com/norem/AeroQuad into development