fixed img path
merging upstream
Merge pull request #89 from amuramoto/master

Fixed img path
building files
Merge pull request #90 from shawnfeldman/master

need to rebuild files
Merge branch 'master' of https://github.com/usergrid/usergrid into Export_Persistance_Integration

# By Shawn Feldman (1) and amuramoto (1)
# Via Shawn Feldman (2) and others
* 'master' of https://github.com/usergrid/usergrid:
  building files
  fixed img path
Added test cases and fixes for the query testing.
Changed error messages such that entire entity is returned with the GET call.