changes in the model
Merge branch 'master' of github.com:chequeado/batata-translator

Conflicts:
	batata-models/batata_models/migrations/0001_initial.py