Fixes #186
Check if folder has items in angular Folder service
Merge pull request #187 from theponti/fix/update-folders-#186

Fix/update folders #186
Merge pull request #188 from theponti/develop

Develop