addtask
Merge branch 'master' of https://github.com/n9clip/web7.0 into feature_addTask