Added gripe servlet

Added gripe servlet
Merge branch 'master' of https://github.com/HackforSC/2014H4SC-Gripe

Conflicts:

	gripe-server/src/main/java/com/slackersbychoice/data/retriever/cicero/CiceroRetriever.java