Merge branch 'david' into origin/customMetadata

Conflicts:
	app/src/main/java/com/radiusnetworks/scavengerhunt/FinishedActivity.java
	app/src/main/java/com/radiusnetworks/scavengerhunt/ScavengerHuntApplication.java
Merge branch 'origin/customMetadata' into customMetadata

Conflicts:
	app/src/main/java/com/radiusnetworks/scavengerhunt/FinishedActivity.java
	app/src/main/java/com/radiusnetworks/scavengerhunt/ScavengerHuntApplication.java