fixes #9985: update grid classes in grid example
Remove multiple touch icons and roll with a single one
Remove old and unused .prettyprint styles in code.less (per #10566)
Merge branch 'master' of github.com:twbs/bootstrap

Conflicts:
	dist/css/bootstrap.min.css