Merge branch 'master' of https://github.com/catalystbirdapp/BirdApp into BIRD-36
Made a custom spinner layout that was smaller so the spinners on the settings screen fit better. Fixed some layout issues.

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

	modified:   res/layout/activity_camera_layout.xml
	modified:   res/layout/activity_camera_settings.xml
	modified:   res/layout/camera_controls.xml
	new file:   res/layout/spinner_custom_layout.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