电厂动态、船舶动态 commit
s
Merge branch 'dev_tangb' of github.com:malaaaaa/FDS into dev_tangb_local

Conflicts:
	.DS_Store
	FDS.xcodeproj/project.pbxproj
	FDS/TBXMLParser.m
	FDS/TangStoryboard.storyboard
Merge branch 'dev_mawp_local' into dev_tangb_local

Conflicts:
	FDS.xcodeproj/project.pbxproj
	FDS.xcodeproj/project.xcworkspace/xcuserdata/mawp.xcuserdatad/UserInterfaceState.xcuserstate
	FDS/MaStoryboard.storyboard
增加设置模块基本功能
增加1.4升级内容及1.5Bug修改
市场指数模块与样式完成