resx追加
Merge branch 'master' of https://github.com/entityhat/style.git