entities y jpas
Merge origin/master