Merge pull request #2517 from pjackson28/master

Moved Contact Us before News in the footer (#2509)
Merge pull request #2518 from pjackson28/master

Deleted orphan demo files (fixed-header-*)
Initial commit of OGPL theme support files.
Merge pull request #2519 from pjackson28/ogpl

Initial commit of OGPL theme support files
Merge pull request #2520 from pjackson28/master

Geomap: Removed garbage value in i18n.csv Vietnamese field
Corrected typo in the Geomap description.