Camera and Audio
Merge branch 'BKT'

Conflicts:
	src/com/thirdi/sensorsupervisor/MainActivity.java