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

// blocklayered: better wording.
[-] MO : Blocklayered - FixBug #PSCSX-1337
[-] MO : Blocklayered - FixBug #PSCSX-1505
// Changelog updated
// Changelog updated
// blocklayered: better wording.
Merge pull request #5 from xBorderie/patch-1

// blocklayered: better wording.
[-] MO : Correct 'show all' issue #PSCSX-2030
// New version
Merge branch 'dev'

Conflicts:
	views/templates/admin/view.tpl