* origin/master: Consistent buttons in Fly and Mission views. Conflicts: src/MissionEditor/MissionEditor.qml