// css fix

Conflicts:

	themes/default-bootstrap/css/global.css
	themes/default-bootstrap/sass/global.scss