Merge branch 'blub' into blubmaster
Merge branches 'blub' and 'blubmaster'
Fixed Makefile and deleted WorkerDict due to bugs
Added Worker to general Makefile