Commit bcc0947a authored by rlacko's avatar rlacko

Merge branch 'dev' into 'master'

beta version

See merge request !14
parents ed3d84bb c90a503d
Pipeline #4671 failed with stages
in 46 seconds