Added gripe change

Added gripe change
Merge remote-tracking branch 'origin/fixencodinggripe'
Merge branch 'master' into jdbcdatasource

* master:
  Added gripe change

Conflicts:
	gripe-server/src/main/java/com/slackersbychoice/data/retriever/database/DatabaseRetriever.java
close conn too