cut & paste & no change
Merge branch 'dev' of github.com:hasadna/ok-qa into dev