voting almost works
Merge branch 'development' into voting_system
no changes to voting, but user edit works