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
Update license header in all files through 'mvn license:update-file-header'
Merge branch 'develop' of https://github.com/InMobi/grill into develop
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
Column name formating to handle comma and jdbc connection close after successful query execution
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
Changes based on review:
1. Search prepared queries by query name and user
2. Set prepared query name when executing prepared query
3. CLI changes to set query name for prepared queries
CLI option to search prepared queries by user and query name
Fix annotation
Merge pull request #113 from jdhok/develop2

Allow query list filtering by query name
Fix javadoc comment for QueryExecutionService.getAllQueries