and changed again
some markup for voting
merged stuff from master
merged latest stuff from origin/app-pages
voting code
tweakery
Merge branch 'voting'