Commit to pull
Merge branch 'master' of https://github.com/tropicalmug/WorldView

Conflicts:
	WorldView/settings.py
HDBS
Added .gitignore.