Merge branch 'master' of https://github.com/litianzhu818/TestObjectForAiert

Conflicts:
AiertApp/UtilityManagers/VideoClass/LibCoreWrap.m
11111Merge branch 'master' of https://github.com/litianzhu818/TestObjectForAiert

Conflicts:
	AiertApp/UtilityManagers/VideoClass/LibCoreWrap.m