some bug fixes
Merge branch 'master' of https://github.com/mco13/CleanBot

Conflicts:
	shared/Wiki.java
Revert and apply changes

Merge branch 'master' of https://github.com/mco13/CleanBot

Conflicts:
	shared/Wiki.java