Merge remote-tracking branch 'lhw/master'

Conflicts:
	lession.txt
Merge remote-tracking branch 'hehl/master'

Conflicts:
	lession.txt
Merge pull request #3 from pinguo-liaofeng/master

liaofeng 21:04