Merge branch 'master' of https://github.com/herokingsley/Emba

Signed-off-by: yaodd <yaodunding2006@163.com>
Merge branch 'master' of https://github.com/herokingsley/Emba

Conflicts:
	SEMBA_IPAD_CLIENT_2.0.xcodeproj/project.pbxproj
	SEMBA_IPAD_CLIENT_2.0.xcodeproj/project.xcworkspace/xcuserdata/marbookair.xcuserdatad/UserInterfaceState.xcuserstate

Signed-off-by: yaodd <yaodunding2006@163.com>