Merge branch 'Joca'
Changes in the RMI Method, to support new database
GORDO