Merge pull request #1 from kissygalleryteam/master

V2.0版本 加入HTML5方案
Merge pull request #6 from doin/master

Auto merge by kpm server