.
Merge remote-tracking branch 'origin/master'

Conflicts:
	DD/settings.py
Merge remote-tracking branch 'origin/master'
0.00.1