Merge pull request #20 from rafapires/master

junta tudo até aqui
Merge pull request #21 from rafapires/adfap2014

Merge pull request #20 from rafapires/master