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
grill client close issue fixed
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
Merge branch 'develop' of github.com:InMobi/grill into cluster_user