finish reorganization
Merge branch 'development' of github.com:andiwand/OpenDocument.java into proto-style

Conflicts:
	odf2html.jar