Merge branch 'dev'
Merge branch 'dev'
Merge branch 'dev'
修复 https://github.com/hexojs/hexo/issues/731 问题
Fix grammar error in output of `hexo init`
Merge pull request #735 from glittershark/master

Fix grammar error in output of `hexo init`
Merge pull request #733 from FlashSoft/master

修复 https://github.com/hexojs/hexo/issues/731 问题
Move test entry script
Merge branch 'master' into dev
Update dependencies
Update front-matter parser. Fix #728