commit for update

commit for update ,增加MediaManager类
Merge branch 'master' of https://github.com/fankejun/CRM

Conflicts:
	CRM/Common/Share/Share.h