Added custom icon image
Added a reset button to the trivia activity
New Map and buttons in mapView
Fixed bug where score does not reset after choosing "No" to try again
Altered some images
Fixed Database reference URL at rkclose.com/FOP
Merge branch 'Rob'

Conflicts:
	FAPApp/bin/FAPApp.apk
	FAPApp/bin/classes.dex
	FAPApp/bin/classes/com/example/fapapp/FAPApp$1.class
	FAPApp/bin/classes/com/example/fapapp/FAPApp$2.class
	FAPApp/bin/classes/com/example/fapapp/FAPApp$3.class
	FAPApp/bin/classes/com/example/fapapp/FAPApp.class
	FAPApp/bin/classes/com/example/fapapp/SignInActivity.class
	FAPApp/bin/resources.ap_
	FAPApp/res/layout/login.xml
	FAPApp/src/com/example/fapapp/FAPApp.java
	FAPApp/src/com/example/fapapp/SignInActivity.java
merged