fixed param combining
lint
Merge pull request #475 from NICTA/broadbandLeafletFix

fixed param combining
switch geoserver-nm.nicta.com.au
typo
Merge pull request #476 from NICTA/awsGeoserver

Aws geoserver
Merge remote-tracking branch 'origin/master' into phil-ui