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

Conflicts:
	inc/lang/en.php
Merge pull request #2 from TOB-CYXOB/devel

Devel