fix
Merge branch 'master' of https://github.com/coderiver/dillerhall

Conflicts:
	1-2catalog-bmw-3series-1.html
	css/screen.css
	jade/1-2catalog-bmw-3series-1.jade
	js/min/valera.min.js
	js/min/valik.min.js
	js/valik.js