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