Edited files.
Merge branch 'master' of
https://github.com/Incomprehendable/SMMOBanManager.git

Conflicts:
	SMMO
BanManager/src/me/incomprehendable/plugins/smmobans/main/objects/PunishmentType.java