5.8. 15:24
5.8 15:30
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