Merge branch 'blcMergeFromBohai' of http://114.115.138.98:8900/fukai/swifteditor into blcMergeFromBohai