fix ad placement
Merge branch 'master' of github.com:twbs/bootstrap

Conflicts:
	docs/assets/css/pack.min.css