merge conflicts resolved, new query
Merge branch 'dev' of https://github.com/ShelvAR/ShelvARApi into dev