Merge pull request #4 from iceman197369/master

Modified beginBlock() for table cell creation
Modified beginBlock() for table cell creation
Merge pull request #5 from iceman197369/master

PullRequest: Changes necessary for merging cells horizontally in tables
Merge remote-tracking branch 'origin/master' into maven

Conflicts:
	no.marintek.mylyn.wikitext.ooxml.core/src/no/marintek/mylyn/wikitext/ooxml/OoxmlDocumentBuilder.java
	org.docx4j/META-INF/MANIFEST.MF
Remove unused dependency.
Update target platform and dependencies.
Merge pull request #6 from iceman197369/master

Changed: Added support for font size and text alignment
Merge remote-tracking branch 'origin/master' into maven

Conflicts:
	no.marintek.mylyn.wikitext.ooxml.core/src/no/marintek/mylyn/wikitext/ooxml/OoxmlDocumentBuilder.java
Merge remote-tracking branch 'upstream/maven' into maven

Conflicts:
	no.marintek.mylyn.wikitext.ooxml.core/src/no/marintek/mylyn/wikitext/ooxml/OoxmlDocumentBuilder.java
	org.docx4j/META-INF/MANIFEST.MF