Merge Alpha updates into master

merge changes from alpha into master
Bugfixes for synchronising file system updates (e.g., file creations, renaming or deletions) with the file tree view