conflict resolved
Merge branch 'master' of https://github.com/purplecode/panio-uwr
conflict solved again