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

Conflicts:
	SEMBA_IPAD_CLIENT_2.0/CoursewareViewController.m
	SEMBA_IPAD_CLIENT_2.0/ReaderViewController.m

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

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