Merge pull request #1 from doin/master

Auto merge by kpm server
Merge pull request #2 from doin/master

Auto merge by kpm server
Merge pull request #3 from doin/master

Auto merge by kpm server
Merge pull request #4 from doin/master

Auto merge by kpm server
Merge pull request #5 from doin/master

Auto merge by kpm server
Merge pull request #1 from kissygalleryteam/master

V2.0版本 加入HTML5方案