Merge branch 'dev'
title2
Revert 41e312e..6781d91

This rolls back to commit 41e312e1232fce26471a4250caeea4b2baafd3ec.
Revert "Revert 41e312e..6781d91"

This reverts commit 6ae77a79e65bec4c10ddb33cd40d5f8d2cb54654.
Revert "title2"

This reverts commit 6781d912b4b7257c759fa69512f78b37eac68dad.
Revert 6781d91..5fdd7dd

This rolls back to commit 6781d912b4b7257c759fa69512f78b37eac68dad.
Merge branch 'dev'
delete jqueryui and jcanvas
delete
change file name
js
选出12个汉字
update