Merge branch 'stuff' into vote

Merge branch 'stuff' into vote
add database auto generated files