Fixed some entity issues

* Also fixed main composer json file, added both repos in replacement block
Merge pull request #285 from elcodi/feature/tax-component

Fixed some entity issues