use internal location where possible
fix thumbnail and links
Added support for Basic authentication end-to-end headers to the GeoNode proxy view.
Merge pull request #1247 from garnertb/master

Added support for Basic authentication end-to-end headers to the proxy view.
Added parent template references for block extra_head in a couple templates where missing
Merge pull request #1248 from mwengren/fix_template_inheritance

Fix missing parent template references in a few template files.
Small js and html improvements to the incomplete uploads section of the upload page.
added german translation
update title text
small text fix
Fixed a JS error and made strings translatable in the actor template.
Replaces the JQuery UI progressbar with the Bootstrap progressbar and safely checks event targets.
CSS and JS cleanup in in the map_download template.
Set up all template strings for translation.  Fixes #617.
Merge branch 'master' of https://github.com/GeoNode/geonode into issue-809

Conflicts:
	geonode/layers/models.py
fix the maps thumbnails internal url
Merge pull request #1252 from simod/issue-809

Use OGC_SERVER.LOCATION for internal communication
Updated changelog for version 2.0c2
Pegging the setup.py file to Django 1.5.4.

With 1.6 out Travis is trying to use it
Django 1.5.5 is already out