cleanup
cleanup
Merge branch 'master' of mottebol.nl:ods-parser

Conflicts:
	lib/tustep/xml_converter.rb
	test/tustep/xml_converter.rb
fix
documentation