// cashondelivery: string easier to translate.
[-] MO : cashondelivery - Fix 1.5 ps_version_compliancy issue
// Fix config.xml indent
// Fixed indent
Merge branch 'dev'

Conflicts:
	config.xml