Changed save task and conditions in different orders for local and ninjaware
Merge branch 'master' of https://github.com/uCtrl/Software