Merge branch 'navbar-brand-margin' of https://github.com/Luis-TP/bootstrap into Luis-TP-navbar-brand-margin

Conflicts:
	dist/css/bootstrap.min.css