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
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 type with an item id.

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

	modified:   res/menu/bird_form.xml
Merge branch 'master' of https://github.com/catalystbirdapp/BirdApp