Merge pull request #4 from node200ok/master

merge from source
Merge pull request #5 from node200ok/master

merge from source
id
Merge pull request #6 from node200ok/master

merge from source
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
Merge pull request #7 from node200ok/master

merge from source
Merge pull request #8 from node200ok/master

merge from source
pagination
joinMore
Merge branch 'master' of https://github.com/funkyLover/yjjapp

Conflicts:
	lib/s.js
vote
图标
Merge branch 'master' of https://github.com/node200ok/yjjapp
vote
Merge pull request #10 from node200ok/master

merge from source
vote bug fixed