Revert "teste sergio"

This reverts commit 984a6ab0b8667f417bdb845257bc5ca5d2995658.
Revert "Revert "teste sergio""

This reverts commit e89588349a6d7ed51e5f082a10507ef7f45eaa78.
novo teste
Revert "novo teste"

This reverts commit ac45aac94748606b1a1914201dc28a07c07d192e.
Revert "Revert "novo teste""

This reverts commit a72a690ad1279a7c9b868e1960cd47ebae615ddc.
Revert "Revert "novo teste""

This reverts commit a72a690ad1279a7c9b868e1960cd47ebae615ddc.
Merge remote-tracking branch 'origin/master'

Conflicts:
	ProjetoGUASCA/Guasca/nbproject/private/private.properties