Merges maven modules

- RIO-80
Merge pull request #52 from objectos/rio_80_nto

RIO-80: modules merge