Merge branch 'master' of http://github.com/yujinmin/ohuimall
Merge branch 'master' of https://github.com/kyhfan/ohuimall