提交代码到DEV
Merge branch 'dev'

Conflicts:
	readme.txt