Merge pull request #523 from teharrison/shock

shock based API
Merge pull request #524 from teharrison/shock

Shock
Merge pull request #529 from teharrison/shock

Shock
Merge pull request #534 from teharrison/shock

merge of develop code
Merge pull request #554 from teharrison/shock

code from develop and more job api actions