Django 1.7c3, detail views
Merge branch 'master' of github.com:shacker/tristano

Conflicts:
	project/apps/sampledata/views.py
	project/templates/books/list.html
	project/urls.py