Merge origin/master

Conflicts:
	IceServer/src/iceserver/ServeOneJabber.java