Merge branch 'hotfix/1.0.2'
Merge branch 'dev' of github.com:hasadna/ok-qa
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
version and admins
Merge branch 'release/1.0.3' into dev
fixing s3 env