Import retailer module
Merge remote-tracking branch 'origin/master'

Conflicts:
	skin/luckybuys/css/style.css