Merge remote-tracking branch 'origin/dev' into dev
Merge remote-tracking branch 'origin/dev' into dev
#7 los data model modifications
#7 introduction of the gup trigger
Merge branch 'feature/7-gup-trigger' into dev