vila graficos
Merge branch 'master' of https://github.com/rafaelmaguilla/si_jacopiei

Conflicts:
	banco.db
	si_jacopiei/urls.pyc
	sistema/forms.pyc
	sistema/models.pyc
	sistema/views.py
	sistema/views.pyc
vila graficos