minor
Merge pull request #1343 from Skillert/tarak

minor
Renamed files, minor fixes
Fix startup errors
Merge pull request #1344 from Skillert/npc

Fix startup errors
Add #1171
Some monster updates
Merge pull request #1345 from EPuncker/master

Some monster updates
fix #1340 and fix #1336