concerto das telas de historico de indicativos
Merge branch 'refatoracao-interface' of https://github.com/educacaoEmFoco/educacaoemfoco into refatoracao-interface

Conflicts:
	EEF/res/layout/activity_tela_estado.xml
Correcao nas telas sobre e navegabilidade de todas para o menu
Merge branch 'refatoracao-interface' of https://github.com/educacaoEmFoco/educacaoemfoco into refatoracao-interface

Conflicts:
	EEF/AndroidManifest.xml
resolucao de conflitos