Fix triangle match and prio
Merge branch 'master' of https://github.com/third-person-immersion/Quadcopter