refactor(desks): re-enable desks on client

SD-371
refactor(desk): re-enable desks on client

- small fixies

SD-371
refactor(desk): re-enable desks on client

fix

SD-371
Merge remote-tracking branch 'nikola/devel' into devel