Holy fucking shit
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/be/vives/citroentjes/sportrijk/model/Location.java