FactoriaDao
Merge origin/master