Merge branch 'feat/99-cttc-add-new-device-type-client-and-emulated-client' into 'develop'

Resolve "(CTTC) Add new device type "CLIENT" and "EMULATED-CLIENT""

Closes #99

See merge request !184