Update gitignore.
Remove unused files.
Merge branch 'dev'