minor
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/logic/Manager.class
Merge remote-tracking branch 'origin/master'

Conflicts:
	bin/logic/Manager.class