Fixed differences in lang files
Merge branch 'development' into dev/j3/common

Conflicts:
	admin/language/en-GB/en-GB.com_newsletter.ini
Merge branch 'development' into dev/j3/common

Conflicts:
	admin/language/en-GB/en-GB.com_newsletter.ini
Merge branch 'dev/j3/common' into dev/j3/free
Fixed lang files
Merge branch 'development' into dev/j3/common
Merge branch 'dev/j3/common' into dev/j3/free