修改了一些文字和操作
.
Merge branch 'master' of
https://github.com/bnrcParticipationSense/theSense.git

Conflicts:
	project.properties