some changes to settings on vps1 - a digitalocean server
Merge remote-tracking branch 'origin/master'

Conflicts:
	openair/settings/base.py
	openair/settings/digitalocean.py
Merge remote-tracking branch 'origin/master'
DB backup for use on other systems