pull in Dave's lates
add some comments
add function to determine if a user has already voted
merge ffrom jp
missing semi
finish the resolution votes counting
finish with resolution votes
merged with remote dev
merge with dev