More work on client side JS
Merge branch 'master' of https://github.com/dordal/userballot
Merge branch 'master' of https://github.com/dordal/userballot
Merge branch 'master' of https://github.com/dordal/userballot
Wireup
Conflict fix
Merge branch 'master' of https://github.com/dordal/userballot