Reverted missing files. Also, generate language js files.
Merge branch 'release-6.0rc1' into develop