Add dist/* to .gitignore
Merge branch 'master' into feature-canvas