css fix
Merge branch 'develop' of github.com:igorline/bd into develop

Conflicts:
	catalog/static/css/main.css