renaming Spree::Config.language to  Spree::Config.preferred_language because naming conflicts
Merge remote-tracking branch 'origin/develop' into develop