Merge branch 'master' of github.com:hasadna/open-shot into dev
Merge branch 'dev' of github.com:hasadna/open-shot into dev
Merge branch 'dev' of github.com:hasadna/open-shot into dev
new answer notification
Merge branch 'dev' of github.com:daonb/okqa into dev
Merge branch 'release/0.9.5' into dev
Only count non-deleted questions and answers for answer percentage
#368 candidate and editor registration links in login page
Use nav class for candidate lists

Makes them look nicer when hovered.
Allow choosing candidate list to show in locality page

By using the candidate list icons as navigation buttons that trigger
reloading the page with the 'mayor' or 'list' get parameters, and adding
a fake candidate list that is the list of mayor candidates.
Show candidate list in locality page when clicked

The default view is to show the mayorship candidates, but now when a
candidate list is clicked, its candidates will be shown instead. To go
to the page of the candidate list, click the title of the candidates
section in the locality page after clicking the candidate list icon in
the navigation bar.
To go back to view the mayorship candidates, click the yellow note which
is displayed above the candidate lists if a list is selected.
Highlight active list when selected

Color the ballot black because otherwise the "active" class colors it
white which is transparent over the white note image.
Remove question_count from context in local_home

Redundant, as this is the same as questions.count.
Make candidate name appear larger than list for clarity
Show only candidate list name in title, not ballot/entity
Show list title even if there are no candidates

To make it clearer that we are showing this list, and allow clicking the
list name to go to the page and see any details there may be on the list
(or edit it if you're an editor).
Remove space before commas in locality page stats

Used the trick of inserting comments between the tags to avoid HTML turning the
whitespace between them to a space before the comma.
Merge branch 'dev' of git://github.com/danielhers/open-shot into danielhers-dev
fix tests, vertical space saving
fix candidate avater layout