jquery版本
Merge branch 'master' of github.com:foright/yami

Conflicts:
	templates/beez_20/javascript/jquery-1.9.1.js