Merge pull request #53 from Cyborgmatt/master

Invoker Wars
Update Frota_english.txt

Removed useless minelines x2
Merge pull request #54 from justSQL/patch-5

Update Frota_english.txt
Fixed dodgy English file -- stop comiting binarys
Fixed think, it now fires every 0.1 seconds
Merge pull request #56 from Cyborgmatt/master

Rebase
Merge pull request #57 from Cyborgmatt/master

Require Invokerwars
Fixed addoninfo.txt, removed frota.swf
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
Added 'fake', a command for testing
Fixed Invoker wars
Added Puck Wars
Fixed english again
Added Rabbits vs Sheep
Added rabbits vs sheep
Merge remote-tracking branch 'upstream/master'
Added WTF mode
Merge pull request #63 from hex6/master

Added rabbits vs sheep
Removed debug print