preparations for user-checking on voting
Merge branch 'master' of git@github.com:LePhil/bacon.git

Conflicts:
	public/ui.js