Custom DAO

Merged Charbel Fourel requested to merge dev_cfourel into develop

Merge request reports