Fix/conference refactoring

Merged Simon Morlat requested to merge fix/conference_refactoring into master

Merge request reports