Forced language links to be capitalized to improve compatibility with future template auto-generation work.
Forced language links to be capitalized to improve compatibility of Base and WET themes with future template auto-generation work. Also fixed merge conflicts.
Changed i18n.csv encoding to UTF-8 (with BOM) to improve compatibility with Microsoft products for editing purposes.
Resolved merge conflict.
Resolved merge conflicts.
Added space to i18n.csv for Chinese colon to prevent inheriting English strings in the future.
Removed duplicated code from the localization files and moved it to the PE
Removed the code duplication from the base localization file
Fixed JSHint errors
Merge pull request #956 from nschonni/placeholder-gcwu-theme

Use Sass placeholders in GCWU theme
Merge branch 'v3.0' of github.com:wet-boew/wet-boew

Conflicts:
	src/theme-gcwu-fegc/sass/includes/_default-responsive-1200.scss
	src/theme-gcwu-fegc/sass/includes/_default-responsive-768.scss
	src/theme-gcwu-fegc/sass/includes/_default.scss
Fix to issue 886 (add space to a-z list) and fix to nav-current on an h3.top-section for intranet

Fix to issue 886 (add space to a-z list) and fix to nav-current on an
h3.top-section for intranet
Merge pull request #968 from cfarquharson/v3.0

Fix to issue 886 (add space to a-z list) and fix to nav-current on an h3...
Merge pull request #964 from LaurentGoderre/i18n-optimize

Optimized the localization files
Resolved merge conflicts.
Added string codes for i18n template strings. Added base.html file for future generation of HTML files.
Resolved merge conflicts.
Added base.html includes for auto-generation of HTML files.
Resolved merge conflicts.
Added the missing spannish strings to the csv file