id
test/vbox.js
Merge branch 'master' of github.com:funkyLover/yjjapp

Conflicts:
	public/s/lotterys.html
	public/s/votes.html
add ask vote
vbox.js
fix