Fixed some entity issues

* Also fixed main composer json file, added both repos in replacement block
Sylius + Trait (php 5.3) = Hmmm