Revert "2014 05 19"

This reverts commit 34ad53c80f170d7220be3e23dabfb99fcb4dfb9a.
2014 05 19 10:40

Correção de conflitos