catalogue
catalogue-discount
Merge branch 'catalogue-nadin'

Conflicts:
	catalogue.html
	css/main.less