* bug fix
Merge branch 'master' of github.com:JokBal/mod-pusher

Conflicts:
	build.gradle
	src/main/scala/org/jokbal/pusher/verticle/HttpServerVerticle.scala