Adapting rest to new DAO\'s - CAF-302
Merge pull request #4017 from cinquo/master

Adapting rest to new DAO\'s - CAF-302