Merge branch 'erkan/tsmatch_v2' into 'master'

add custom settings option to the app, and replace old apk

See merge request iiot/demonstrator2!29