Merge branch 'master' into dev
Add `public` folder to project
Merge branch 'dev'