add mergeAdater
Merge branch 'master' of https://github.com/zhoulzhou/IPCPlayer