testando generic views
Merge branch 'master' of github.com:almeidajeff/ProjetoManha