Added camera display and capture functionality.

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

	modified:   AndroidManifest.xml
	new file:   res/layout/activity_camera_layout.xml
	modified:   res/menu/bird_form.xml
	modified:   res/values/strings.xml
	modified:   src/com/catalyst/android/birdapp/BirdFormActivity.java
	new file:   src/com/catalyst/android/birdapp/CameraActivity.java
	new file:   src/com/catalyst/android/birdapp/camera/CameraPreview.java
Added additional camera functionality. Camera now returns to preview when capture button is clicked. Capture button now overlays
on preview screen.

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

	modified:   AndroidManifest.xml
	modified:   res/layout/activity_camera_layout.xml
	new file:   res/layout/camera_controls.xml
	modified:   src/com/catalyst/android/birdapp/CameraActivity.java
	modified:   src/com/catalyst/android/birdapp/camera/CameraPreview.java
Added comments, cleaned up code.

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

	modified:   AndroidManifest.xml
	modified:   res/layout/activity_camera_layout.xml
	modified:   res/layout/camera_controls.xml
	modified:   res/values/strings.xml
	modified:   src/com/catalyst/android/birdapp/CameraActivity.java
	modified:   src/com/catalyst/android/birdapp/camera/CameraPreview.java
Added capture button dimensions to dimens.xml.

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

	modified:   res/layout/camera_controls.xml
	modified:   res/values/dimens.xml
	modified:   res/values/strings.xml
Moved capture button to the middle of the screen. Added some styling to capture button.

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

	modified:   res/layout/camera_controls.xml
	modified:   res/values/dimens.xml
Fixed merge conflict in strings.xml