Merge pull request #574 from cbartol/develop

Fixed condition when deleting a Unit
Removed usages of JsonSimple from JerseyServices, fixed researchers export