Added location manager and listener
Merge remote-tracking branch 'origin/master'

Conflicts:
	app/src/main/java/noam/mapi/MapsActivity.java