switch to cameratest
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