remove 1
Merge remote-tracking branch 'zts1993/beta' into beta

Conflicts:
	.gitignore
remove 1