Merge branch 'Branch_chat-ui' into 'develop'

Adding an AI Assistant UI (fix for #43)

See merge request !37