Add of courses
Merge branch 'master' into vicente
Add folders in initial view
Fixes merge conflicts
Fix merge conflict