// 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
// blocklayered: better wording.
Merge branch 'dev'