Merge remote-tracking branch 'origin/gh-pages' into gh-pages

Conflicts:
	_posts/2014/2014-03-27-面向过程的jquery验证插件.md
	_posts/2014/2014-05-13-jquery-qrcode.md