reseed database and format pages
Merge remote-tracking branch 'upstream/master'
Format cart and pages