Merge branch 'master' of https://github.com/yaodd/SEMBA

Conflicts:
	SEMBA_IPAD_CLIENT_2.0/SearchViewController.m

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