Merge pull request #43 from pnml/upstream

XHTML table import: support for adjacent vertically merged cells...
CxCy support for SldSz
NotesSlidePart support
Don't remove the SdtBlock (content control) unless it actually contains
a sectPr.
Merge pull request #44 from bezda/master

Presentation image scaling, and slide notes creation
Merge remote-tracking branch 'origin/master'
Fix for issue 46 (POI uses default .xml content type to identify pkg)
Correct semantics for parent/child
DEBUG logging
Bugfix: preserve PPr in MERGEFIELD processing
Deletion of comments sample
update
add contributor
remove a log debug
trivial comment fix
comment fix
Find Calibri etc on Mac OSX
Change of location of FopUtils
VariableReplace: document what the variables have to look like.
Move FOPUtils