equipment query added
return to include entity_type
Merge branch 'master' of https://github.com/gobfrey/OR2014-chalege