map
Merge branch 'master' of github.com:vacuum-head/BangaloreMetro

Conflicts:
	src/com/vacuumhead/bangalore/MapActivity.java
ic
Merge branch 'master' of github.com:vacuum-head/BangaloreMetro