Merge pull request #1 from HerculesWS/master

- 合并Hercules最新的内容
- remove malaya.txt from npc/scripts.conf
Merge pull request #33 from CairoLee/master

Remove malaya.txt from npc/scripts.conf