...
Merge branch 'master' of https://github.com/victormelo/projeto-pbd

Conflicts:
	agronomia/settings.py
	agronomia/settings.pyc
	agronomia_pbd/models.pyc
testando push