Edited manifest to add intrumentationTestRunner.
Added jars for mockito.
Added mockito jars.
Deleted test file
Fixed GPS Utitlity package declarations for imports which got changed when Michael pulled
an older version of the code that had an older package declaration.

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

	modified:   src/com/catalyst/android/birdapp/BirdFormActivity.java
	modified:   src/com/catalyst/android/birdapp/GPS_Utility/GPSUtility.java
	modified:   src/com/catalyst/android/birdapp/MapActivity.java
Merge branch 'master' of https://github.com/catalystbirdapp/BirdApp into BIRD-36
Merge branch 'BIRD-36' into BIRD-62
Finished BIRD-62.  Needs some UI work, but the backend seems to be working perfectly.

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
Revert "Finished BIRD-62.  Needs some UI work, but the backend seems to be working perfectly."

This reverts commit 7db925bdf28bae49b407704c843f9c5249f5bc4c.
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
Revert "Made a custom spinner layout that was smaller so the spinners on the settings screen fit better. Fixed some layout issues."

This reverts commit a3f3c4b7cfd3b37f1fde36a914a66a9f8abd80d3.