标准化文档
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/widget/jquery.menu.js
Merge branch 'master' of https://github.com/bisone/jquery-papeo

Conflicts:
	src/widget/jquery.menu.js