add vote
Merge branch 'vote' into dev