testing gs22
Add geopsip parameter to tweetmap and fix regular expression to handle utf8 chars
Fix slurp
Fix templates
update gxp
Bring back maps/admin.py
Add missing properties to context_processors
Fix SearchBar, tweak tweetmap
Fix SearchBar
Bring back searchbar
Fix bug
gs22
comment out debug line
Show maintenance page if tweet server is down
Changes from geonode/master
Initial attempt at using geoserver 2.2 and alternate layer-specific security
Add new fields
Fix dates
South migrate
Merge branch 'master' into wmplus

Conflicts:
	src/GeoNodePy/geonode/maps/views.py
	src/GeoNodePy/geonode/settings.py
Fix some bugs
Change some log settings for debugging, tweak SQL
Bug fixes
Merge branch 'master' into wmplus
Add missing import