Merge branch 'release/0.8.5'
Merge branch 'master' of github.com:hasadna/ok-qa
Merge branch 'master' of github.com:hasadna/ok-qa into dev
Fixing edit button, #247