Added worker id field to all controller/worker rmi calls
Merge remote-tracking branch 'origin/master'