Merge pull request #13 from YmallShopping/translations

Translations
Merge pull request #14 from YmallShopping/master

Merge pull request #13 from YmallShopping/translations