Mark working
Merge branch 'dev_alberto' into dev_raul
Added progress field to all courses views