Better device descriptions
Merge branch 'feature/device_descriptions' into develop

* feature/device_descriptions:
  Better device descriptions