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
sycn scheduler with develop
Merge branch 'develop' of https://github.com/InMobi/grill into scheduler

Conflicts:
	grill-api/src/main/java/com/inmobi/grill/api/query/GrillQuery.java
	grill-server/src/main/java/com/inmobi/grill/server/AllApps.java
resolving conflicts
correcting scheduler resource classname
changing Impl class
Merge pull request #117 from zupta/tmp

Resolve conflicts in scheduler merge
sync with scheduler for changes