2.4.7

Merge branch 'develop'

Conflicts:
	assets/css/admin-column.min.css

2.4.2

css

2.4.1

Merge branch 'release-2-4-1'

Conflicts:
	languages/cpac.mo
	languages/cpac.po