passing the initial files to hannah so she can work on the layout fo the map
info window adapter.  Added a hasmap to store the bird sighting assigned to
the map marker.

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

	new file:   res/layout/map_window_adapter.xml
	modified:   src/com/catalyst/android/birdapp/MapActivity.java
Added text fields to map layout.

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

	modified:   res/layout/map_window_adapter.xml
	modified:   res/values/strings.xml
Added the functionality to show the info of a bird sighting when you click on the
sighting icon on the google map. Also fixed it so that the database holds the date
a unix time.

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

	modified:   res/layout/map_window_adapter.xml
	modified:   res/values/dimens.xml
	modified:   res/values/strings.xml
	modified:   src/com/catalyst/android/birdapp/BirdFormActivity.java
	modified:   src/com/catalyst/android/birdapp/MapActivity.java
	modified:   src/com/catalyst/android/birdapp/database/DatabaseHandler.java
Fixed bug where the current location marker threw a null pointer.  Fixed

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

	modified:   res/values/strings.xml
	modified:   src/com/catalyst/android/birdapp/MapActivity.java
Resolved merge conflicts.