Rename method in FileDAO from getRoot to getRoots
Merge remote-tracking branch 'origin/master'