Termine de pasar el MapauEntities y el MapauDAO
Merge master
Merge remote-tracking branch 'origin/master' into emanuel