pdf2html is now converting converting into another directory, and splitting file
Merge branch 'develop' of github.com:OS2web/os2web_cp_service into develop

Conflicts:
	os2web_cp_service.module