production
Merge remote-tracking branch 'origin/vadim'

Conflicts:
	css/screen.css
	img/icons-sfb06dd5d05.png