this is workspace check in for the fouth time #4.10:50
Merge branch 'master' into niuniu

Conflicts:
	text.txt