Updating to latest build
Merge branch 'master' of github.com:apigee/usergrid-portal