dev
dev
Merge pull request #1 from kissygalleryteam/master

Merge pull request #1 from moxiao/master
Merge pull request #2 from moxiao/master

Auto merge by kpm server