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

Conflicts:
	about.html
	bid.html
	catalog.html
	catalog_item.html
	consultation.html
	contacts.html
	honors.html
	index.html
	press-center.html
	reviews.html
	science-base.html
	search-results.html
	search_goods.html
	sep_new.html
	where2buy.html
	work-form.html
	work.html