Merge branch 'Liupeng' into develop

Conflicts:
	wp-content/themes/HdingLift/index.php (reverted from commit c89c00d96c9d4f599b19d3da61f849f81f57e051)