merge gui/task-list into master