smartshope updated
Merge branch 'master' of https://github.com/eshope/eshope.github.io