Merge branch 'feature/#1-xpoint3-aglie-works-3' of https://gitlab.com/atled-aw-app/aw-app-android into feature/#1-xpoint3-aglie-works-3