Merge branch 'master' into wmplus
Merge branch 'master' into wmplus
Merge branch 'master' into wmplus
Merge branch 'master' into wmplus
Merge branch 'master' into wmplus
Merge branch 'master' into wmplus
Merge branch 'master' into wmplus
Merge branch 'master' into wmplus
Merge branch 'master' into wmplus
Merge branch 'master' into wmplus
Merge branch 'master' into wmplus
Add hsl functionality to tweetmap conditional on geops ip
Merge branch 'gs22' into wmplus

Conflicts:
	src/GeoNodePy/geonode/maps/models.py
	src/GeoNodePy/geonode/maps/views.py
Merge gs22 (GeoServer 2.2)
Use different repo for PrintPreview (original disappeared);
eventually won't be needed,  but not yet.
Fix upload TOC, add tweet graph JS files
Merge branch 'wmplus' of https://github.com/cga-harvard/cga-worldmap into wmplus
Merge branch 'master' into wmplus
disable about window on embed page
Fix messed up divs
Merge branch 'geoanno' into wmplus