Fixing ownership tile (was missing for companies with none issued)
Fixing merge conflict
Merge branch 'master' of https://github.com/sharewave/frontus