Merge branch 'hotfix/Some_cleanup'
Merge branch 'develop' of https://github.com/Vinczek/quadcocopter into develop