// blocklayered: better wording.
// blocklayered: better wording.
Merge pull request #3 from xBorderie/patch-1

// blocklayered: better wording.
Merge branch 'dev'

Conflicts:
	views/templates/admin/view.tpl
[-] MO : Fixed category name update bug #PSCSX-2092
// blocklayered: wording.
// Wording.
// Wording.
Merge pull request #9 from xBorderie/patch-1

// blocklayered: wording.
Fix incompatibility : product comparison & block layered
Merge pull request #12 from Mezcalito/dev

[-] MO : compareProducts not assigned in ajax
[*] MO : blocklayered - Optimized showPriceFilter method
// Remove compliancy + version changed
// blocklayered: better wording.
Merge branch 'dev'
Merge pull request #13 from yenshirak/PSCSX-2092

[-] MO : Fixed category name update bug #PSCSX-2092
[-] MO : blocklayered - fix heading bad var name
// attribute_form: wording
// attribute_form_1.6: wording
// attribute_group_form: wording