Cleaned up code after last(minute) changes in Prague.
Merge branch 'stack/amor_missionctrl' of github.com:BtbN/amor-gruppe into stack/amor_missionctrl