edit in experimental
edit in master
Merge branch 'experimental'

Conflicts:
	art_mall/安装说明.txt
edit fix the diff
2th edit
2 th edit in master
fix diff yet