Merge pull request #112 from moon-bear/fix_conflict

Fix conflict
Merge branch 'master' of https://github.com/moon-bear/firmware into mavlink_new_board