Merge branch '223-bugs-causados-por-merges' into 'development'

Resolve "Bugs causados por merges"

Closes #223

See merge request !123
1 job for 225-desconsiderar-alunos-que-ja-venceram-as-fases in 3 minutes and 46 seconds (queued for 1 second)