Merge branch '3.0.0-navbar-default' of https://github.com/juthilo/bootstrap-wip into juthilo-3.0.0-navbar-default

Conflicts:
	dist/css/bootstrap.min.css