[-] MO : blockcmsinfo - Encoding restitution issue #PSCSX-1554 fixed
// Changelog updated
// Changelog updated
// shop context selector added
// blockcmsinfo: shortened titles.
[-] MO : blockcmsinfos - Fix multishop issue #PNM-2409
// norms

Conflicts:

	blockcmsinfo.php
// norms
//Version Update
Merge branch 'dev'

Conflicts:
	blockcmsinfo.php
	config.xml