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
Merge branch 'master' of https://github.com/HerculesWS/Hercules
Fixed Bug #7300
Extremity Fist SP Cap raised to work better with renewal stats.
http://hercules.ws/board/tracker/issue-7300-asura-strike/

Signed-off-by: ThinkIV <thinkivme@gmail.com>