Fix bug with wrong entity mapping
Merge branch 'master' of github.com:bocharsky-bw/bow