Added functionality to save current map location to shared preferences.

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

	modified:   res/values/strings.xml
	modified:   src/com/catalyst/android/birdapp/MapActivity.java
Finished with the saving of shared preferences for the map so that it would
return the user to the last place they were looking at if the GPS is disabled.

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

	modified:   src/com/catalyst/android/birdapp/MapActivity.java
/removed all of the raw strings and replaced them with references to the strings.xml file

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

	modified:   res/values/strings.xml
	modified:   src/com/catalyst/android/birdapp/BirdFormActivity.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
Revert "This branch was overwritten at some point, so I went back and found the changes"

This reverts commit 1fd7ffc8fb1b9080353d2e93b058d9fd56430ae1.
Merge branch 'master' of https://github.com/catalystbirdapp/BirdApp
Fixed text view IDs for common name and scientific name on the main form

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

	modified:   res/layout/activity_bird_form.xml
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
Card passed QA
Merge branch 'master' into BIRD-60
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