Android Location
Merge remote-tracking branch 'origin/master'

Conflicts:
	Trips/backend/src/main/java/be/kdg/backend/dao/impl/ParticipatedTripDaoImpl.java