Chenged path
Merge branch 'master' of github.com:expertsystems/jodconverter
Reset snapshot
Merge branch 'master' of github.com:expertsystems/jodconverter

Conflicts:
	jodconverter-core/pom.xml