Merge pull request #63 from apigee/USERGRID-753

Usergrid 753
Merge pull request #64 from apigee/USERGRID-753

Usergrid 753
Merge branch 'master' into USERGRID-1185