Updating config.js
Merge branch 'dev' into v4.1

Conflicts:
	config_examples/config.js
Merge pull request #8 from OPEC-PML/v4.1

V4.1 into master
Merge pull request #10 from OPEC-PML/dev

Development mode changes
Merge pull request #12 from OPEC-PML/dev

removing stray }
New .htaccess for proxying plotting service requests
Merge pull request #18 from OPEC-PML/dev

New graphing with irregular polygon, info slide out, bug fixes
Merge branch 'master' of https://github.com/OPEC-PML/GISportal
Merge pull request #22 from OPEC-PML/dev

timeline fix, IE9 no stylesheet fix, open graph in IE9 fix, remove unneeded CSS
Merge branch 'master' of https://github.com/OPEC-PML/GISportal
Merge pull request #25 from OPEC-PML/dev

Dev
Merge branch 'master' of https://github.com/OPEC-PML/GISportal
Merge pull request #27 from OPEC-PML/dev

Fixed a bug where autoScale status was forgoten
Merge branch 'master' of https://github.com/OPEC-PML/GISportal
Merge pull request #31 from OPEC-PML/dev

Dev
Merge branch 'master' of https://github.com/OPEC-PML/GISportal
Merge pull request #32 from OPEC-PML/dev

Added required files for the about.htlm page
Merge branch 'master' of https://github.com/OPEC-PML/GISportal
Merge pull request #35 from OPEC-PML/dev

Move fixes for the about page
Merge branch 'master' of https://github.com/OPEC-PML/GISportal