Fix double imported classes bug.
Merge pull request #28 from martin-helmich/bug-namespace-mixup

Fix double imported classes bug
Merge remote-tracking branch 'upstream/master' into feature-doctrine-fullmigration