Kaska Progress
Merge remote-tracking branch 'origin/master'

Conflicts:
	includes/NPCTemplates.as
Merge remote-tracking branch 'origin/master'

Conflicts:
	includes/NPCTemplates.as