code refactoring & add escopo list activity
Merge branch 'master' of github.com:MC-Arquitetura/Android