Merge pull request #10 from gmuteam/master

sync master
Merge pull request #11 from gmuteam/master

sync master
Merge pull request #12 from gmuteam/master

sync master
增加JPGJS调研
Merge pull request #38 from miller/master

增加JPGJS调研