merge fixes
Merge branch 'master' of https://github.com/Dli42/Dota_Hero_Script_Testing.git

Conflicts:
	scripts/npc/npc_abilities_custom.txt