kommit
Merge branch 'master' of https://github.com/avonil/EasyBike

Conflicts:
	src/com/example/easybike/MapsActivity.java