Initial commit of BIRD-36

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

	new file:   res/drawable-hdpi/gear_icon_small.png
	new file:   res/layout/activity_camera_settings.xml
	modified:   res/layout/camera_controls.xml
	modified:   res/menu/bird_form.xml
	new file:   res/menu/camera_settings.xml
	modified:   res/values/strings.xml
	modified:   src/com/catalyst/android/birdapp/BirdFormActivity.java
	new file:   src/com/catalyst/android/birdapp/CameraSettingsActivity.java
	modified:   src/com/catalyst/android/birdapp/camera/CameraPreview.java
Added menu to camera with relevant options.

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
	modified:   res/values/dimens.xml
	modified:   res/values/strings.xml
	modified:   res/values/styles.xml
	modified:   src/com/catalyst/android/birdapp/CameraActivity.java
Add comments, cleaned up code and xml files.

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

	modified:   res/layout/activity_camera_layout.xml
	modified:   res/layout/activity_camera_settings.xml
	modified:   src/com/catalyst/android/birdapp/CameraActivity.java
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
Merge remote-tracking branch 'origin/master' into BIRD-94

Conflicts:
	src/com/catalyst/android/birdapp/CameraActivity.java