Fixed app bug that force closed app when camera resumed.  Changed "Delete" button to "Retake Picture"

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

	modified:   res/layout/activity_picture_confirmation.xml
	modified:   res/values/strings.xml
	modified:   src/com/catalyst/android/birdapp/CameraActivity.java
	modified:   src/com/catalyst/android/birdapp/camera/CameraPreview.java
Merge branch 'BIRD-113' into BIRD-97