Remove estimated effort from tab control
Merge branch 'dev_alberto' into dev_raul
Fixes on course