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

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