Merge remote-tracking branch 'origin/ui' into ui
adding functions
solve conflict
Merge branch 'master' into ui
Merge branch 'master' into ui
add commands
improve tasks functions
Merge remote-tracking branch 'origin/ui' into ui
merged ui into master