bugs fix
Merge branch 'master' of https://github.com/CreativeMediaWorkshop/CreativeMediaWorkshop
Merge branch 'master' of https://github.com/CreativeMediaWorkshop/CreativeMediaWorkshop
fix bugs in view and task_scheduler
Merge branch 'master' of https://github.com/CreativeMediaWorkshop/CreativeMediaWorkshop
fix problems in server