Feature update from test.os2web.bellcom.dk
Merge branch 'develop' of github.com:OS2web/os2web_cp_service into develop

Conflicts:
	os2web_cp_service.info