lang EN 006(nb)
Merge branch 'devel' of github.com:TOB-CYXOB/emn into devel

Conflicts:
	inc/lang/en.php