fix compilation errors
Update moxy to 2.5.0
fix build file: switch MOXy -> Oracle
Moved MOXy based build to a profile.
field canonicalisation: missing separator case - bug fix
Merge branch 'master' of https://github.com/plutext/docx4j
Fix NPE in conjunction with almost empty documents
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
bugfix: don't add the run again
Workaround for Word 2010 not displaying all spaces where you have
multiple FORMTEXT in a single run
Merge pull request #68 from ai-github/master

Added conversion support for some css properties (convert from xhtml to docx).
throw InputIntegrityException if not found
test case for https://github.com/plutext/docx4j/issues/70
check for presence of sample data
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