Merge remote-tracking branch 'upstream/master'

Conflicts:
	resource/Frota_english.txt
	scripts/npc/npc_abilities_custom.txt
	scripts/vscripts/addon_init.lua
Merge pull request #59 from Z-Machine/master

Warlocks/Deadlock