1.0
1.0
Merge pull request #1 from kissygalleryteam/master

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

Auto merge by kpm server