00000
Merge branch 'master' of https://github.com/aifang/phoneApp3

Conflicts:
	bin-debug/phoneApp3.swf
	src/view/mapView.mxml