fancyStore is almost done
Merge branch 'addShipping'