merge conflict tadeuzagallo
Merge branch 'tadeuzagallo-associantion-model-name'