Added a Map to the Event Detail Screen
The app now runs a service on background even if the user closes the app
Merge branch 'master' of https://github.com/rokel/PocketPoints

Conflicts:
	prototype/src/main/java/uk/co/rokel/pocketpoints/prototype/EventDetailFragment.java
	prototype/src/main/java/uk/co/rokel/pocketpoints/prototype/MainActivity.java
	prototype/src/main/res/layout/fragment_event_detail.xml
Merge branch 'master' of https://github.com/rokel/PocketPoints

Conflicts:
	prototype/src/main/AndroidManifest.xml
	prototype/src/main/res/layout/fragment_event_detail.xml
Merge branch 'master' of https://github.com/rokel/PocketPoints

Conflicts:
	prototype/src/main/java/uk/co/rokel/pocketpoints/prototype/EventDetailFragment.java
Added list of on progress events
GPS service running on background
We get rid of some calls to events database
Merge branch 'master' of https://github.com/rokel/PocketPoints

Conflicts:
	prototype/src/main/java/uk/co/rokel/pocketpoints/prototype/MainActivity.java
	prototype/src/main/java/uk/co/rokel/pocketpoints/prototype/TimetableFragment.java