Fix conflicts
Merge branch 'master' of https://github.com/HPNeo/clickandbuy-web