working instance
Merge remote-tracking branch 'origin/master'

Conflicts:
	5/src/mw/MWClient.java