1.0版本bug修复完毕
Merge branch 'Branch_v1.0'

Conflicts:
	readme.txt