Feature/client

Merged Chocobozzz requested to merge feature/client into master

Merge request reports