Merge branch 'master' into development
[UPDATE] fix worker

- refactor worker to make task obsolete
- remove worker/task
Merge branch 'development'