Map screen on EventDetailFragment in progress
Merge branch 'master' of https://github.com/rokel/PocketPoints

Conflicts:
	prototype/src/main/java/uk/co/rokel/pocketpoints/prototype/services/CheckUserLocationService.java