++
++
Merge branch 'master' of https://github.com/Grapheme/arredamenti

Conflicts:
	static/about.html
	static/catalog.html
	static/contacts.html
	static/partnership.html
	static/popup.html