adding camera settings
Merge branch 'master' of github.com:jtrovato/starfish-avocado

merging Martin and Joe's android stuff
fixed iso and zoom bars, working on ading white balance
added wb bar, working on locking AE and WB
implementing OpenCVCameraListener2,and try to use OpenCVCameraViewBase
changed exception to warning for camera locks
made adjusts for moto g, we have AE lock
create custom JavaCameraView so we can edit the camera controls and use openCV
cleaned up the files, trying to rotate the view
Merge branch 'master' of https://github.com/jtrovato/starfish-avocado

Conflicts:
	android_app2/bin/AndroidManifest.xml
	android_app2/bin/R.txt
	android_app2/bin/classes.dex
	android_app2/bin/resources.ap_
	android_app2/bin/starfish.apk