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
Fix #257: show ask question button in any locality

If asked in a wrong locality, a message is displayed after redirect to the correct one.
adding a suggestion to check the questions on your locality
adding a suggestion to check the questions on your locality
adding a link to domain on the line added
unicode shmunicode
Merge branch 'dev' of github.com:daonb/okqa into dev
Merge branch 'dev' of https://github.com/hasadna/open-shot into moshe742-dev
fix translation, fix #256
Merge branch 'dev' of git://github.com/ricardinho/open-shot into ricardinho-dev

Conflicts:
	locale/he/LC_MESSAGES/django.mo
	locale/he/LC_MESSAGES/django.po
improve queries, fix calculation
#352 remove flags from locality page
Merge branch 'no-flag-question-list' of git://github.com/danielhers/open-shot into danielhers-no-flag-question-list
fix typo
#255 replace text in question buttons with icons
Fix test: upvoting only allowed in your locality
#352 show upvote button in all cases

If the user is not authenticated or if they are not in the correct
locality, they will get an error message after clicking the button. But
it is always displayed.