Merge branch 'develop'
Merge branch 'develop'
Merge branch 'develop'
fix a bug of os.date
Merge pull request #45 from jacktang/master