added basic maps and Station entrance data
Merge branch 'master' of github.com:kushpatel/MetroSub

Conflicts:
	AndroidManifest.xml
	MetroSub.iml
	res/layout/map.xml
	src/com/MetroSub/activity/TripByLocationActivity.java