Merge branch 'develop' into 'master'

Merged all requests and fixed directory structure. See merge request stf/stf-566/saref4wear!23

Merge branch 'develop' into 'master'
75bca2af · Mauro Dragoni · 95d9d238 · 029c7433 · 75bca2af · 75bca2af
Commit 75bca2af authored 4 years ago by Mauro Dragoni
--- a/.gitignore
+++ b/.gitignore
+/target/
+.project
+.classpath
+.settings
--- a/diagram/device.drawio
+++ b/diagram/device.drawio
--- a/diagram/device.png
+++ b/diagram/device.png
--- a/diagram/event.drawio
+++ b/diagram/event.drawio
--- a/diagram/event.png
+++ b/diagram/event.png
--- a/diagram/function.drawio
+++ b/diagram/function.drawio
--- a/diagram/function.png
+++ b/diagram/function.png
--- a/diagram/information.drawio
+++ b/diagram/information.drawio
--- a/diagram/information.png
+++ b/diagram/information.png
--- a/diagram/overview.drawio
+++ b/diagram/overview.drawio
--- a/diagram/overview.png
+++ b/diagram/overview.png
--- a/diagram/wearable.drawio
+++ b/diagram/wearable.drawio
--- a/diagram/wearable.png
+++ b/diagram/wearable.png
--- a/diagram/wearablecomponent.drawio
+++ b/diagram/wearablecomponent.drawio
--- a/diagram/wearablecomponent.png
+++ b/diagram/wearablecomponent.png
--- a/example/catalog-v001.xml
+++ b/example/catalog-v001.xml
--- a/example/indoor-event.ttl
+++ b/example/indoor-event.ttl
--- a/example/openair-event.ttl
+++ b/example/openair-event.ttl
--- a/example/sportwearable.ttl
+++ b/example/sportwearable.ttl