gps and distance
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/cinemetroproject/cinemetro/MapActivity.java
changed the layout of maplistitem