add mapview.
Merge branch 'master' of https://github.com/liyinhgqw/parkinglot

Conflicts:
	bin/classes.dex
	bin/classes/com/example/ipark/MainActivity$2.class
	bin/classes/com/example/ipark/MainActivity$3.class
	bin/classes/com/example/ipark/MapActivity$1.class
	bin/classes/com/example/ipark/MapActivity.class
	bin/classes/com/example/ipark/R$id.class
	bin/classes/com/example/ipark/R$layout.class
	bin/classes/com/example/ipark/R$menu.class
	bin/classes/com/example/ipark/R$string.class
	bin/classes/com/example/ipark/R$style.class
	bin/iPark.apk
	bin/resources.ap_
	gen/com/example/ipark/R.java
	res/layout/map_activity.xml
	src/com/example/ipark/MapActivity.java