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

Resolve "Bugs causados por merges"

Closes #223

See merge request !123
1 job for 226-criar-pagina-de-geracao-de-grade in 4 minutes and 36 seconds (queued for 2 seconds)