Merge entity associated to versioned entity#1573

Merged

Ocramius merged 4 commits intodoctrine:masterfrom AdactiveSAS:MergeVersioned

Dec 11, 2015

+159-2

Commits on Nov 27, 2015

Unit test & fix for merge versionned entity
bilouwan
committed

Commits on Nov 30, 2015

Fix compatibility with php5.4
bilouwan
committed

Commits on Dec 2, 2015

Fix superflous whitespaces & empty lines
bilouwan
committed

Commits on Dec 4, 2015

Refactor testing Proxy not initilized
bilouwan
committed