Merge branch 'Develop'

aql/convertQuery.go

aql/convertQuery_test.go

aql/hierarchy.go

aql/hierarchy_test.go

aql/mockConvertQuery.go

entity/entitycypher/queryStructCypher.go

entity/fixIndices.go

entity/hierarchyStruct.go

entity/queryStructValidator.go

interface.go

main/main.go

realtest.json

test.json

test2.json

test3.json