edit gitignore
remove all tilda files
some fixes
Merge branch 'hotfix/some_fixes'

* hotfix/some_fixes:
  some fixes
  remove all tilda files
  edit gitignore