modify by lei
Merge branch 'dev' of github.com:Mudenng/gitleran into dev

Conflicts:
	file