Resolving JDatabase query for issue
Resolve conflition strings
Merge pull request #28 from memonwasim/reviewqueries_new

Resolving JDatabase query for issue