Merge branch 'master' of https://github.com/ozomer/ok-qa
Making the user's locality immutable, fixing #77
Merge branch 'master' of https://github.com/hasadna/open-shot

# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
# 
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
Issue #106 - not pretty, default choice should be the current city.