Alteracoes
léxico
Merge branch 'joao-02' into bruno-0212

merge