minor bug fixes
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/com/example/yuehu/camera/camera_activity.java
Voice command activated