Fix ".gitignore"
Merge branch 'master' into develop
Fix filebrowser