添加了滑动界面
Merge branch 'master' of
https://github.com/bnrcParticipationSense/theSense.git

Conflicts:
	bin/classes/com/bupt/bnrc/thesenser/R$id.class
	bin/classes/com/bupt/bnrc/thesenser/R$layout.class
	bin/classes/com/bupt/bnrc/thesenser/R$menu.class
	bin/classes/com/bupt/bnrc/thesenser/R$string.class
	bin/classes/com/bupt/bnrc/thesenser/R$style.class
	gen/com/bupt/bnrc/thesenser/R.java