Add persist state and restart grill services

Conflicts:

	grill-server/src/main/java/com/inmobi/grill/server/GrillService.java
	grill-server/src/main/java/com/inmobi/grill/server/GrillServices.java
	grill-server/src/main/resources/grill-default.xml
	grill-server/src/test/resources/grill-site.xml
Add persistence to query service

Conflicts:

	grill-api/src/main/java/com/inmobi/grill/api/GrillConf.java
	grill-api/src/main/java/com/inmobi/grill/api/query/QueryHandle.java
	grill-server-api/src/main/java/com/inmobi/grill/server/api/query/QueryContext.java
	grill-server/src/main/java/com/inmobi/grill/server/GrillServices.java
	grill-server/src/main/java/com/inmobi/grill/server/query/QueryExecutionServiceImpl.java
	grill-server/src/test/java/com/inmobi/grill/server/GrillJerseyTest.java
Fix setting cancelled state
Fix test cancel query
Merge branch 'develop' of https://github.com/InMobi/grill into restart
Update restartability only for launched queries
Update consistent state filter
Update config.apt
Update install-steps doc
Add separate config for enabling restarts and recover from old state
Add non-null check
Update config doc
Merge pull request #2 from InMobi/restart

Grill server to recover running queries upon restarts
do not skip the deployment step for grill
Merge pull request #4 from rajubairishetti/fix-pom

Do not skip the deployment step for grill
Fix typo in Readme
Revert "Merge pull request #4 from rajubairishetti/fix-pom"

This reverts commit 428ea570bc0e03f727e5fd17a1ead96db65f12d5, reversing
changes made to b77790f480fa2966aa6170e2125897f05273ed88.
Skip deploying war file
Update version to 1.0.0-SNAPSHOT
Add admin endpoint for metrics