Merge pull request #61 from apigee/USERGRID-753

Updated props for ease of user user and moved JobData into entities
Merge pull request #62 from apigee/USERGRID-753

Usergrid 753
Merge branch 'master' into USERGRID-753