Bug/frommaster

#### Reviewers
@jesuspg @jesuspg @alberts-tid @jframos 

#### Description
inclusion of the jesus jersey branch, the hibernate problem 

### Test
Tested locally. It needs to be deployed and pass all tests

Character not allowed at the end of the file.