field canonicalisation: missing separator case - bug fix
Fix compilation errors in some classes
Added conversion support for some css properties

Properties:
- font (adding first in a list of fonts separated by commas);
- font-size support for px;
- background-color property for run and paragraph properties;
- added strike css property as "[line-through]";
- enabled vertical alignment and added "sub" to be checked;
Field canonicalisaton: better support for nested fields
Only canonicalise the fields we're able to update: namely MAILMERGE and DOCPROPERTY
DOCPROPERTY FieldUpdater use correct key
ComplexFieldLocator: use END not SEPARATE, since the latter is optional.
setBeginRun correctly, so MERGEFIELD can be deleted
Merge pull request #68 from ai-github/master

Added conversion support for some css properties (convert from xhtml to docx).
bugfix: don't add the run again
Workaround for Word 2010 not displaying all spaces where you have
multiple FORMTEXT in a single run
throw InputIntegrityException if not found
test case for https://github.com/plutext/docx4j/issues/70
Merge branch 'master' of https://github.com/plutext/docx4j
fix compilation errors
Update moxy to 2.5.0
fix build file: switch MOXy -> Oracle
Merge branch 'master' of https://github.com/plutext/docx4j
Merge branch 'master' of https://github.com/tinne/docx4j into tinne-master

Conflicts:
	src/glox4j/java/org/glox4j/samples/AddGloxToDocx.java
mapIds