Merged BIRD--99 with master to continue develoment

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

	modified:   src/com/catalyst/android/birdapp/MapActivity.java
	modified:   src/com/catalyst/android/birdapp/database/DatabaseHandler.java
Merge went wrong.  this commit brings back the code that was overwritten during the merge.

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

	modified:   src/com/catalyst/android/birdapp/MapActivity.java
	modified:   src/com/catalyst/android/birdapp/database/DatabaseHandler.java
Added the edit form activity and finished BIRD-99.  When you click on the map info
window it now takes you to the edit form.

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

	new file:   res/layout/activity_edit_form.xml
	new file:   res/menu/edit_form.xml
	new file:   res/values/ids.xml
	modified:   src/com/catalyst/android/birdapp/BirdSighting.java
	new file:   src/com/catalyst/android/birdapp/EditFormActivity.java
	modified:   src/com/catalyst/android/birdapp/MapActivity.java
Removed the check for google play services as it is not needed. Fix a bug where the manifest and strings
file did not get updated last time.

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

	modified:   AndroidManifest.xml
	modified:   res/values/strings.xml
	modified:   src/com/catalyst/android/birdapp/BirdFormActivity.java
Fixed a bug that causes a null pointer if the current location marker is clicked

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

	modified:   src/com/catalyst/android/birdapp/MapActivity.java
Hot fix for bug issue where the app force sloses in the map and/or
the sighting info is not displayed. Will come up with a more comprehensive fix
tomorrow.

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

	modified:   src/com/catalyst/android/birdapp/MapActivity.java