proper entities ids
common upsert
Merge branch 'master' of https://github.com/nokia-wroclaw/hackathon-goidea