Add missing backtick in comment
remove webkit-overflow-scrolling from modal for now /cc #8495
Merge pull request #8498 from cvrebert/patch-1

Add missing backtick in comment
remove margin from left side of navs since it's no longer being set
Merge branch '3.0.0-wip' of github.com:twitter/bootstrap into 3.0.0-wip
Merge branch '3.0.0-wip' into 3.0.0-sass-wip

Conflicts:
	docs/assets/css/bootstrap.css
	scss/_modals.scss