layout
Merge branch 'master' of https://github.com/DerekFangming/phoneApp

Conflicts:
	src/mapView.mxml