Modified Configuration
Merge branch 'master' of https://github.com/mikedgibson/germdb

Conflicts:
	germdb/settings.py