Reverted merging of master and updated classes to reflect most current changes.

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

	modified:   src/com/catalyst/android/birdapp/CameraActivity.java
	deleted:    test/com/catalyst/android/birdapp/gps_utility/GPS_UtilityTest.java
	modified:   test/com/catalyst/android/birdapp/utilities/CameraUtilityTest.java