update
add clear emacs temp file
Merge branch 'develop'

Conflicts:
	.gitignore

	修改：      .gitignore