Wide
Merge remote-tracking branch 'origin/master'

Conflicts:
	themes/front/assets/css/main.css