Set the staging URL in registration templates
disable the root redirect to /about/
Add link to /openapi/
Merge branch 'production' into staging

* production:
  update images from production
  add joomla downloads
  Turn DEBUG off in production
Encode a wider range of XML strings
allow format query param in get object
Merge remote-tracking branch 'production/production' into production

* production/production:
  allow format query param in get object
Use {{ domain }} in registration emails

So they will work for both staging and production
Add fabfile

Forgot to re-add it after purging from the svn export
Remove again

We've added it on another branch, so leave this branch as is
Merge branch 'production' into staging

* production:
  allow format query param in get object
  Encode a wider range of XML strings
  Parse xml fragments as XML 1.1

Conflicts:
	django/idsapi/openapi/search_builder.py
Update django patch version
Add comment about server URLs being per server
Update production settings with those from live server

which also match the staging server settings
Move api specific settings into their own file
Merge branch 'staging'

* staging:
  Move api specific settings into their own file
  Update production settings with those from live server
  Add comment about server URLs being per server
  Update django patch version
  Remove again
  Add fabfile
  Use {{ domain }} in registration emails
  allow format query param in get object
  Encode a wider range of XML strings
  Add link to /openapi/
  disable the root redirect to /about/
  Set the staging URL in registration templates

Conflicts:
	deploy/pip_packages.txt
	django/idsapi/openapi/search_builder.py
	django/idsapi/settings.py
	django/idsapi/urls.py
Make new settings_api work with localdev