Merge pull request #202 from apigee/USERGRID-1993

Usergrid 1993
Merge branch 'master' of github.com:apigee/usergrid-stack into USERGRID-1993