Fixed translation conflicts with spree core

Fixes #74
Merge branch '2-1-stable' of https://github.com/spree/spree-multi-domain into 2-1-stable