Added Zoom functionality and White Balance functionality to camera settings.

Signed-off-by: Hannah <hyoung20@gmail.com>

	modified:   res/values/strings.xml
	modified:   src/com/catalyst/android/birdapp/CameraActivity.java
	modified:   src/com/catalyst/android/birdapp/camera/CameraPreview.java
Fixed typo in an id name.

Signed-off-by: Hannah <hyoung20@gmail.com>

	modified:   res/menu/bird_form.xml
Merge branch 'BIRD-36' into BIRD-39

Signed-off-by: Hannah <hyoung20@gmail.com>

Conflicts:
	src/com/catalyst/android/birdapp/CameraActivity.java

	modified:   res/layout/activity_camera_settings.xml
	new file:   res/layout/camera_settings_button.xml
	new file:   res/layout/spinner_custom_layout.xml
	modified:   res/values/dimens.xml
	modified:   res/values/strings.xml
	modified:   res/values/styles.xml
	modified:   src/com/catalyst/android/birdapp/CameraActivity.java
Zoom, and white balance now change with selection from settings menu.

Signed-off-by: Hannah <hyoung20@gmail.com>

	modified:   res/layout/camera_controls.xml
	modified:   src/com/catalyst/android/birdapp/CameraActivity.java
	modified:   src/com/catalyst/android/birdapp/camera/CameraPreview.java
	new file:   src/com/catalyst/android/birdapp/utilities/CameraUtilities.java
Added junit tests, cleaned up code, put in javadocs

Signed-off-by: Hannah <hyoung20@gmail.com>

	modified:   res/layout/activity_camera_settings.xml
	modified:   res/values/strings.xml
	modified:   src/com/catalyst/android/birdapp/CameraActivity.java
	modified:   src/com/catalyst/android/birdapp/camera/CameraPreview.java
	modified:   src/com/catalyst/android/birdapp/utilities/CameraUtilities.java
	new file:   test/com/catalyst/android/birdapp/utilities/CameraUtilityTest.java
Added comments, cleaned up code formatting.

Signed-off-by: Hannah <hyoung20@gmail.com>

	modified:   res/values/dimens.xml
	modified:   src/com/catalyst/android/birdapp/CameraActivity.java
	new file:   test/com/catalyst/android/birdapp/test/gps_utility/GPS_UtilityTest.java
	modified:   test/com/catalyst/android/birdapp/utilities/CameraUtilityTest.java
Added restore defaults button, fixed up utility tests.

Signed-off-by: Hannah <hyoung20@gmail.com>

	modified:   src/com/catalyst/android/birdapp/CameraActivity.java
	modified:   test/com/catalyst/android/birdapp/utilities/CameraUtilityTest.java
additional commit

Signed-off-by: Hannah <hyoung20@gmail.com>

	modified:   src/com/catalyst/android/birdapp/CameraActivity.java
Reverted merging of master and updated classes to reflect most current changes.

Signed-off-by: Hannah <hyoung20@gmail.com>

	modified:   src/com/catalyst/android/birdapp/CameraActivity.java
	deleted:    test/com/catalyst/android/birdapp/gps_utility/GPS_UtilityTest.java
	modified:   test/com/catalyst/android/birdapp/utilities/CameraUtilityTest.java
Merge branch 'SPRINT-TWO' into BIRD-39

Signed-off-by: Hannah <hyoung20@gmail.com>

Conflicts:
	res/layout/activity_map.xml
	res/layout/map_controls.xml
	res/layout/map_settings.xml
	src/com/catalyst/android/birdapp/MapActivity.java
Added javadocs and removed a line of commented out code.

Signed-off-by: Hannah <hyoung20@gmail.com>

	modified:   src/com/catalyst/android/birdapp/CameraActivity.java