queries updated with regards to issue #29
queries updated with regards to issue #29
Merge branch 'memonwasim-reviewqueries' into develop
Remove commented code