bugfix
Merge branch 'rb1.0'
Merge branch 'v1.0'
Merge pull request #1 from nelsoft-easyshop/master

asdasdsadasd