文件查看改造中....
Merge branch 'dev_tangb' of github.com:malaaaaa/FDS into dev_tangb_local
地图模块
Conflicts:
	FDS/TBXMLParser.m
s
delete .DS_Store
commit mawpuserdata
Merge branch 'dev_mawp_local' into dev_tangb_local

Conflicts:
	FDS.xcodeproj/project.pbxproj
	FDS.xcodeproj/project.xcworkspace/xcuserdata/mawp.xcuserdatad/UserInterfaceState.xcuserstate
	FDS.xcodeproj/xcuserdata/mawp.xcuserdatad/xcschemes/FDS.xcscheme
	FDS.xcodeproj/xcuserdata/mawp.xcuserdatad/xcschemes/xcschememanagement.plist
	FDS/AppDelegate.m
	FDS/TangStoryboard.storyboard
改造注册页面，完善载入模块