This branch was overwritten at some point, so I went back and found the changes
and redid the branch.

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

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