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

Conflicts:
	bin-debug/controller.swf
	src/login.mxml
	src/mapView.mxml