Merge branch 'hotfix/version.bump'
fix bug with not updating folders
Merge branch 'hotfix/fix.folder.tree' into develop