Merge branch 'release/0.9.9'
Merge branch 'master' of github.com:hasadna/open-shot
Merge branch 'release/1.0'
Merge branch 'release/1.0.1'
oops
Merge branch 'dev'
Better local toolbar and better twitter feed