Mudança de logo,
popup tempo de inatividade
Merge remote-tracking branch 'origin/master'

Conflicts:
	implementation/solution/src/main/resources/i18n/map_en.properties