Fix for doctrine mappings issues in ShippingBundle.
Merge pull request #341 from stloyd/bugfix/doctrine_mapping

Fix for doctrine mappings issues in ShippingBundle.