Fixed GRILL-619
Merge branch 'develop' of https://github.com/InMobi/grill into develop
GRILL-619 - Fixed review comments
GRILL-619 - Fixed some more review comments
GRILL-619 - Moved conf to a single place
Bug fix : Explain to return proper error message
Merge pull request #110 from sushilmohanty/develop

Bug fix : Explain to return proper error message
Update license header in all files through 'mvn license:update-file-header'
Merge branch 'develop' of https://github.com/InMobi/grill into develop
grill client close issue fixed
Fix links on java client doc
GRILL-619 - Fixed review comments
Merge branch 'develop' of https://github.com/InMobi/grill into develop
Merge branch 'develop' of https://github.com/sumashivaprasad/grill into develop

Conflicts:
	grill-server/src/test/java/com/inmobi/grill/server/GrillAllApplicationJerseyTest.java
	grill-server/src/test/java/com/inmobi/grill/server/TestGrillApplication.java
Merge pull request #111 from akshaygoyal/develop

grill client close issue fixed
Merge pull request #107 from sumashivaprasad/develop

Make webservice resource loading pluggable in Grill server
Allow query list filtering by query name