only show language switcher if csrf token is provided
use dtl safe delimiters in js templates
switch to external bootstrap forms app
Merge branch 'master' into bootstrap

* master: (65 commits)
  Better looking default for feature info.
  django admin command cleardeadlayers deletes layers from GeoNetwork as well
  package_client does not need to unzip geonode-client, it is done by setup_geonode_client
  Updated GEONODE_CLIENT_LOCATION
  Moved media to static
  Removed creation of staticfile, zip_extractall does it by default
  Switched to geonode/static/geonode instead of geonode/media/static
  Switched to the new LOGGING dictionary notation in local_settings.py
  Removed the need to use geoserverpass in production as well
  GEOSERVER_TOKEN is now set to SECRET_KEY during development
  Updated AUTHORS. Welcome Bart, Thanks Ian and Michael.
  Profile link now points to create profile when none exists
  Fix DataCartOps to include CSRF token in the form it builds
  Fixed issue with databas restore.
  Avoid getting SLD from the REST interface, use /geoserver/styles/ endpoint instead. Fixes #219
  Fixed numbering in update layers. It now starts from 1 instead of 0.
  Fixed path to site.css in customization instructions.
  Fixed path to GeoNode logo in documentation.
  Updated backup doc with notes.
  Added backup documentation.
  ...

Conflicts:
	src/GeoNodePy/geonode/settings.py
remove chosen
move bootstrap static into static dir
merge map templates
merge profile templates
remove bootstrap profile templates
merge registration templates
include new maps base template
merge avatar template
merge base templates
update error templates
remove unused template
remove bootstrap templates dir from settings
add back missing js
Merge branch 'master' into bootstrap

* master: (69 commits)
  Added AerialWithLabels as a default background layer with visibility=False
  Added Bing and Mapbox sources, they are not enabled by default but accessible through the add layer dialog
  Added missing .mo files
  Added default JAVA_HOME to /etc/default/tomcat6 for Ubuntu 12.04
  Added location of postgis.sql for postgres 9.1
  Fixed location of static files in local_settings.py
  Fixed logging in local_settings and added it to settings also
  Added MapQuest imagery to list of base layers
  Moved default zoom and center to a more inclusive default. (We still love you Nicaragua)
  Added Mapquest base layer and TMS/Mapbox support in the backend
  Updated italian locale
  Update locale files
  Ran makemessages on all available languages
  Marked Powered by as translatable
  Fixed some typos
  Fix javascript tag and remove social header
  Fix javascript tags and move rating and social under title
  Fix errant merge detritus
  Move jqery to geonode/static (vs old geonode/media)
  Fixed help page
  ...

Conflicts:
	src/GeoNodePy/geonode/templates/data_base.html
	src/GeoNodePy/geonode/templates/index.html
	src/GeoNodePy/geonode/templates/maps.html
	src/GeoNodePy/geonode/templates/maps/download.html
	src/GeoNodePy/geonode/templates/maps/layer.html
	src/GeoNodePy/geonode/templates/maps/layer_describe.html
	src/GeoNodePy/geonode/templates/maps/layer_permissions.html
	src/GeoNodePy/geonode/templates/maps/layer_replace.html
	src/GeoNodePy/geonode/templates/maps/layer_upload.html
	src/GeoNodePy/geonode/templates/maps/mapinfo.html
	src/GeoNodePy/geonode/templates/profiles/profile_detail.html
	src/GeoNodePy/geonode/templates/registration/login.html
Merge branch 'bootstrap' of git://github.com/eldarion/geonode into opendri-dev

Conflicts:
	shared/requirements.txt
	src/GeoNodePy/geonode/settings.py
	src/GeoNodePy/geonode/templates/base.html
	src/GeoNodePy/geonode/templates/developer.html
	src/GeoNodePy/geonode/templates/index.html
	src/GeoNodePy/geonode/templates/maps.html
	src/GeoNodePy/geonode/templates/maps/layer.html
	src/GeoNodePy/geonode/templates/maps/layer_replace.html
	src/GeoNodePy/geonode/templates/maps/layer_upload.html
	src/GeoNodePy/geonode/templates/maps/mapinfo.html
	src/GeoNodePy/geonode/templates_bootstrap/data_base.html
	src/GeoNodePy/geonode/templates_bootstrap/developer.html
	src/GeoNodePy/geonode/templates_bootstrap/index.html
	src/GeoNodePy/geonode/templates_bootstrap/maps/layer.html
	src/GeoNodePy/geonode/templates_bootstrap/maps/layer_upload.html
	src/GeoNodePy/geonode/templates_bootstrap/maps/view.html
	src/GeoNodePy/geonode/templates_bootstrap/search_base.html
Merge branch 'opendri-dev' of github.com:GFDRR/geonode into opendri-dev

Conflicts:
	src/GeoNodePy/geonode/settings.py