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

Resolve "Bugs causados por merges"

Closes #223

See merge request !123
1 job for 218-criar-modulo-da-interface-que-converta-adega-para-weka in 3 minutes and 22 seconds (queued for 3 seconds)