logging jogging
Merge branch 'master' of https://github.com/alexjck/XmmpProxy

Conflicts:
	src/filters/MessageTransformingFilter.java
	src/filters/Monitor.java
	src/filters/MultiplexingFilter.java
	src/jabber/client/Body.java
	src/parser/XmppParserAuth.java
	src/protocol/XmppProtocol.java
	src/server/ServerProperties.java
	src/utility/Attachment.java
	src/utility/DummieServer.java