TS05 - additional changes
Merge branch 'jobson' of https://github.com/projeto-si-lansab/si-lansab into jobson