Modification for the heavy client
Merge branch 'master' of https://github.com/yanngit/Ecom