Merge pull request #24 from memonwasim/reviewqueries

Update query to JDatabase format
Fix Issues
Merge pull request #25 from irshad11/develop

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

Resolving JDatabase query for issue
queries updated with regards to issue #29