Changes to integrate mapping interface with
web-service
Commiting Android Manifest
Committed local changes for integration
Merge branch 'master' of https://github.com/navjot227/inmapper-android

Conflicts:
	bin/MainActivity.apk
	bin/classes.dex
	bin/resources.ap_
	src/com/example/sampleone/MapActivity.java