Added script for files with directorys
Change tests
hasFolder with 2 parameters works
Merge branch 'dev'