Fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	wurst/content/heros/crusader/CrushingHalo.wurst
	wurst/core/units/Hero.wurst
Merge remote-tracking branch 'origin/master'

Conflicts:
	wurst/content/heros/crusader/CrushingHalo.wurst
	wurst/core/units/Hero.wurst
bounty
Merge branch 'master' of https://github.com/Frotty/thwcontest

Conflicts:
	wurst/content/creeps/Mammoth.wurst