Merge pull request #1 from jfinal/master

nothing