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
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