Usergrid 252

Finished.  Please remove branch on merge