Merge commit 'fetch_head' into Localization
Localization for settings sections
ProductEdit, Order localization. Refactoring of settings localizations
Merging
Merge pull request #642 from koswesley/Localization

Localization
Merge pull request #643 from protherj/pre-cg-fixes

Pre cg fixes
product fixes