Fixed stuff
Merge branch 'master' of https://github.com/markbuikema/bearded-bugfixes

Conflicts:
	InternetTech/src/internettech/manager/ShareManager.java
	InternetTech/src/internettech/protocol/SaxProtocol.java