updated docs
django 1.5
removed commented-out lines from settings
.
Merge branch 'feature/django1.5' into develop