views.py, settings.py, urls.py
Merge remote-tracking branch 'origin/master'