Get all queries to include from persistent store as well
Filter persisted queries by state
Fix tests for TestGrillDAO
Merge pull request #115 from jdhok/develop2

Get all queries to include from persistent store as well
merged upstream develop