Change secretballot usage so it does not hijack the objects manager anymore
Merge branch 'develop' of github.com:praekelt/jmbo into develop