change text from developer/yijun branch
Merge branch 'develop' into developer/yijun

Conflicts:
	hello.php
Merge pull request #1 from yijunz/developer/yijun

change text from developer/yijun branch