update version
Merge branch 'gh-pages' of https://github.com/jcores/blog.git into
gh-pages

Conflicts:
	resources/duoshuo/duoshuo.js
	resources/js/core.js