Changed DatastoreQuery to support and, or and more complex operations
Merge branch 'master' of https://github.com/feroult/endpoint into new_query