Fixed differences in lang files
Merge branch 'development' into dev/j2/free
Fixed lang files
Merge branch 'development' into dev/j2/free