Added docstrings
Added docstrings for class-based views
Added TODO note about renaming URL kwargs
Merge branch 'master' into dev