fix bugs
Merge branch 'master' of github.com:antme/x-e-commerce
Merge branch 'master' of github.com:antme/x-e-commerce