Better implementation using jetty
Merge branch 'master' of https://github.com/MCME/TheGaffer

Conflicts:
	src/main/resources/config.yml