query ui
query ui3
Merge branch 'master' of https://github.com/bloider007/jin121206

Conflicts:
	vox.html