新建分支，用来自己测试数据库操作
Merge remote-tracking branch 'origin/xxj_branch' into CameraTest

Conflicts:
	bin/classes/com/bupt/bnrc/thesenser/TestActivity.class
	gen/com/bupt/bnrc/thesenser/R.java