Update demos/grids/grid-message-eng.html
Fixed overlap tab overlap of content in .tabs-style-2
Merge remote-tracking branch 'upstream/v3.0' into tabbed-interface-overlap
Merge pull request #993 from patheard/tabbed-interface-overlap

Tabbed interface overlap fix
Merge pull request #994 from MaddyDaigle/v3.0

Update demos/grids/grid-message-eng.html
Fixed issue with the i18n encoding
Merge branch 'v3.0'

Conflicts:
	src/js/i18n/i18n.csv
Merge branch 'master' into experimental