Refactoring yesterday bugs with locales, resources
Merge branch 'feature/material_and_task_in_course' into staging