better handling of cells with rowspan: use css margins rather than placeholder divs for left/right, stop using bootstrap.css (classes moves to PageWidgets.css)

Conflicts:

	code/widgets/CarouselWidget.php