Normalizando APP
Resolve
Resolve Conflitao
Resolve Conflitao
Merge pull request #2 from diegograssato/development

Development