Update merkDoughBundle.php

Removed Mapping from the namespace as it was adjusted in Doctrine
Merge pull request #11 from inspiran/master

Removed Mapping from the namespace as it was adjusted in Doctrine
Updated version constraints
fix conflicts