feature/server and client update

Created by: stro18

Merge request reports

Loading