add job state 'queued' and task state 'in-progress' for less confusion
Merge branch 'master' of https://github.com/wtangiit/AWE