Merge remote-tracking branch 'origin/master'

# Conflicts:
#	pages/card/card.vue
#	pages/shop-info/shop-info.vue