commit
Merge branch 'master' of https://github.com/hanxianlong/mywordpress

Conflicts:
	wp-content/themes/epachina/includes/version.php