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
Merge branch 'BIRD-62' into BIRD-61

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

Conflicts:
	src/com/catalyst/android/birdapp/MapActivity.java

	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