local commit for rebase
Merge branch 'master' of https://github.com/aerobless/BloodAST.git

Conflicts:
	BloodAST/src/ch/theowinter/BloodAST/modules/PunishmentManager.java