添加了数据存储
5.8. 15:24
5.8 15:30
添加了文件的数据
switch to cameratest
添加了数据库查询接口
添加了测试程序
Merge remote-tracking branch 'origin/CameraTest' into xxj_branch

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
	bin/classes/com/bupt/bnrc/thesenser/TestActivity.class
	gen/com/bupt/bnrc/thesenser/R.java
	res/layout/activity_test.xml
	src/com/bupt/bnrc/thesenser/TestActivity.java
Merge branch 'xxj_branch' of
https://github.com/bnrcParticipationSense/theSense.git into xxj_branch

Conflicts:
	bin/classes/com/bupt/bnrc/thesenser/TestActivity.class
	gen/com/bupt/bnrc/thesenser/R.java
、、
Merge branch 'xxj_branch'