heichenxuan
Merge branch 'dev'

Conflicts:
	README.md
merge fixed