Everyday Shorts and BOGO Pants Banner Add / version
Merge remote-tracking branch 'origin/master' into dev

Conflicts:
	_banners.json
	index.html