use internal location where possible
fix thumbnail and links
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
use public url in the map download page
use an initial query in search
Merge pull request #1255 from simod/issue-1254

use an initial query in search
Added fixsitename command, refs #498
Added fixsitename call to updateip, fixes #498
Fixed missing thumb behavior, fixes #998
when login is successfull, update the CSRFToken in OpenLayers.Request.DEFAULT_CONFIG.headers
Merge pull request #1253 from bartvde/login

Map saving gives a CSRF error
Updated changelog for version 2.0c3
strip csw:GetRecordByIdResponse element if it exists
Merge pull request #1259 from tomkralidis/metadata-xml-upload-strip-csw-tag

strip csw:GetRecordByIdResponse element if it exists
no error message anymore