Bug-fix for FileSystem::setRoot
made sure we use correct paths
Merge branch 'development'