chapter 11 Generic Views
In 1.6, old list_detail has been deprecated, please reference
https://docs.djangoproject.com/en/1.6/ref/class-based-views/generic-display/
Merge remote-tracking branch 'origin/master'