ultima alteracao
Merge branch 'master' of github.com:rodrigolucianocosta/r-one_project
Meg
Conflicts:
	rOneProject/cadastro/models.py
	rOneProject/db.sqlite3