reupload
Merge remote-tracking branch 'origin/master'

Conflicts:
	Hub.java
	XmlParser.java