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 code for Randy because his computer was not working. Code saves maptype selection in shared preferences so that the
spinner reflects the current maptype.

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

	modified:   src/com/catalyst/android/birdapp/MapActivity.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
Merges the sprint master branch into BIRD-62

Merge branch 'SPRINT-TWO' into BIRD-62

Signed-off-by: maroon5five <randy_miller@mail.com>

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

	modified:   res/layout/activity_bird_form.xml
	modified:   res/layout/activity_camera_settings.xml
	modified:   res/layout/activity_map.xml
	renamed:    res/layout/map_controls.xml -> res/layout/camera_settings_button.xml
	modified:   res/layout/map_controls.xml
	modified:   res/layout/map_settings.xml
	new file:   res/layout/spinner_custom_layout.xml
	modified:   res/menu/bird_form.xml
	modified:   res/values/dimens.xml
	modified:   res/values/strings.xml
	modified:   res/values/styles.xml
	modified:   src/com/catalyst/android/birdapp/BirdFormActivity.java
	modified:   src/com/catalyst/android/birdapp/CameraActivity.java
	modified:   src/com/catalyst/android/birdapp/MapActivity.java
	modified:   src/com/catalyst/android/birdapp/camera/CameraPreview.java
	modified:   src/com/catalyst/android/birdapp/database/DatabaseHandler.java
	modified:   src/com/catalyst/android/birdapp/utilities/AlertDialogFragment.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 Camera Functionality, changed database to reflect one to one
relationship between Pictures and Sightings. Updated the BirdSighting
class to reflect this (i.e. getPicturePath, setPicturePath) Picture path
and previously entered values from BirdFormActivity are passed through the
intent, using Bundles. Have fun
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
Getters and setters someone got deleted, might have been from when this branch was reverted back to
remove the changes of BIRD-96.

Signed-off-by: Hannah <hyoung20@gmail.com>
Merge branch 'SPRINT-TWO' of https://github.com/catalystbirdapp/BirdApp into BIRD-95a

Conflicts:
	res/values/strings.xml
	src/com/catalyst/android/birdapp/CameraActivity.java
Anna
Please test on your phone
Now, picture saves with different settings, including zoom and white
balance. Need to manually test if all resolution settings work.:
changed spacing in alert box
Fixed the alert spacing for the bird form submit

Signed-off-by: maroon5five <randy_miller@mail.com>

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