ready merge from github
Merge branch 'master' of https://github.com/xielong2046/ndyih

Conflicts:
	temp/caches/f/index_40F756F0.php