Added *.fuse_hidden* to .gitignore
Merge master into dev for .gitignore