Merge pull request #1 from jfinal/master

更新最新代码