v4.1.5(WD)201408261813

增加分辨率单位
Merge remote-tracking branch 'doyoe/master'
Merge branch 'master' into gh-pages
HTML错误修正
Merge branch 'master' into gh-pages