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

Conflicts:
	.DS_Store
	SEMBA_IPAD_CLIENT_2.0.xcodeproj/project.xcworkspace/contents.xcworkspacedata
	SEMBA_IPAD_CLIENT_2.0.xcodeproj/xcuserdata/marbookair.xcuserdatad/xcschemes/xcschememanagement.plist
	SEMBA_IPAD_CLIENT_2.0.xcodeproj/xcuserdata/outenfei.xcuserdatad/xcschemes/SEMBA_IPAD_CLIENT_2.0.xcscheme
	SEMBA_IPAD_CLIENT_2.0/AppDelegate.h
	SEMBA_IPAD_CLIENT_2.0/AppDelegate.m
	SEMBA_IPAD_CLIENT_2.0/Images.xcassets/AppIcon.appiconset/Contents.json
	SEMBA_IPAD_CLIENT_2.0/Images.xcassets/LaunchImage.launchimage/Contents.json
	SEMBA_IPAD_CLIENT_2.0/SEMBA_IPAD_CLIENT_2.0-Info.plist
	SEMBA_IPAD_CLIENT_2.0/SEMBA_IPAD_CLIENT_2.0-Prefix.pch
	SEMBA_IPAD_CLIENT_2.0/en.lproj/InfoPlist.strings
	SEMBA_IPAD_CLIENT_2.0/main.m
	SEMBA_IPAD_CLIENT_2.0Tests/SEMBA_IPAD_CLIENT_2.0Tests-Info.plist
	SEMBA_IPAD_CLIENT_2.0Tests/SEMBA_IPAD_CLIENT_2_0Tests.m
	SEMBA_IPAD_CLIENT_2.0Tests/en.lproj/InfoPlist.strings

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

Conflicts:
	.DS_Store

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