Camera Test
before merge with Camera Test
Merge branch 'CameraTest'

Conflicts:
	gen/com/bupt/bnrc/thesenser/R.java
5.8. 15:24
5.8 15:30