add some words from develop branch
Merge branch 'develop' into developer/yijun

Conflicts:
	hello.php