Merge branch 'master' into Eliane-Margarida-S.-O.-Ramos
Merge branch 'Eliane-Margarida-S.-O.-Ramos' into Entrega1
Merge branch 'master' into Eliane-Margarida-S.-O.-Ramos

Signed-off-by: Eliane Margarida <eliane.margarida@gmail.com>
Signed-off-by: Eliane Margarida <eliane.margarida@gmail.com>
Merge branch 'Entrega1' into Eliane-Margarida-S.-O.-Ramos