Merge branch 'develop' of gitlab.c3sl.ufpr.br:vsbc14/enchente into develop

 Conflicts:
	tests/runTests.sh
8 jobs for develop in 49 minutes and 46 seconds (queued for 1 second)