Merge pull request #130 from cyrilraja/master

*DO-4271 6.2 QA [Teach] Assinged collection does not show in Class
*DO-4074 When collection is moved into folder, collection is still displayed outside of folder