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