Sync with development

Bruno Meyer requested to merge development into 114-integrar-analises-relacionada-ao-curso-com-o-sistema-web Oct 12, 2018