Finalized one innerWrap to wrap them all
Merge branch 'master' of http://github.com/typo3-themes/theme_bootstrap
Merge branch 'master' of http://github.com/typo3-themes/theme_bootstrap

Conflicts:
	Configuration/TypoScript/Library/content.layouts.bootstrap.setupts
	Configuration/TypoScript/Library/content.layouts.setupts