Template error fixes
Added Detail View
Merge branch 'DetailView'

Conflicts:
	bootstrap/urls.py
	bootstrap/views.py