Increased length of Scientific Name input to 75 characters.
Added functionality to save pictures. Creates new folder on external
storage called birdAppPictures. Saves jpgs as Bird01 and increments with
each subsequent photo taken.
ahdsjnasdfkg
Added new camera functionality from within the application. Need to test.
Added new camera functionality. Need to test.
Merge remote-tracking branch 'origin/master' into BIRD-94

Conflicts:
	src/com/catalyst/android/birdapp/CameraActivity.java
Added camera functionality. Need to test
Merge branch 'master' into BIRD-94
Made the spinners and text smaller, fixed some layout issues.

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

	new file:   res/layout/spinner_custom_layout.xml
	modified:   res/values/dimens.xml
	modified:   res/values/styles.xml
	modified:   src/com/catalyst/android/birdapp/CameraActivity.java
This branch was overwritten at some point, so I went back and found the changes
and redid the branch.

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

	modified:   res/layout/activity_map.xml
	new file:   res/layout/map_controls.xml
	new file:   res/layout/map_settings.xml
	modified:   res/values/strings.xml
	modified:   src/com/catalyst/android/birdapp/MapActivity.java
Merge branch 'master' of https://github.com/catalystbirdapp/BirdApp into BIRD-36

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

Conflicts:
	src/com/catalyst/android/birdapp/CameraActivity.java
Fixed camera activity.

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

	modified:   src/com/catalyst/android/birdapp/CameraActivity.java
Merge branch 'master' of https://github.com/catalystbirdapp/BirdApp into BIRD-36
Fixed some git issues.

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

	modified:   res/layout/activity_camera_settings.xml
	modified:   res/values/styles.xml
Added comments, cleaned up some code, finished the small fix I was implementing for what was thought to be a git issue.

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

	modified:   res/layout/activity_camera_settings.xml
	new file:   res/layout/camera_settings_button.xml
	modified:   src/com/catalyst/android/birdapp/CameraActivity.java
Fixed typo in an id name.

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

	modified:   res/menu/bird_form.xml
Fixed type with an item id.

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