Merge branch 'master' of https://github.com/zhenleisun/wp

Conflicts:
	wp-content/themes/yueboke/category.php
	wp-content/themes/yueboke/index.php