Merge remote-tracking branch 'origin/update_vgl'
Merge remote-tracking branch 'origin/160-workflow-module-text-shifts'
Merge remote-tracking branch 'origin/99-esgf-session-authentication'
Merge remote-tracking branch 'origin/96-layer-controls-scroll'
Fixed geojs data argument for testing
Updated VGL
Fixed geojs testing options
Added option for testing
Merge remote-tracking branch 'origin/bug#168_fix_geoweb_testing' into next