Correcoes fluxo telas
Merge remote-tracking branch 'origin/smartphone' into smartphone