...
Merge branch 'master' of https://github.com/jkiddo/jolivia.git

Conflicts:
	jolivia.jetty/src/main/java/org/dyndns/jkiddo/guice/JoliviaServer.java