Replacing old generic views with class based ones. Making {% url tags 1.5 compatible
Merge remote-tracking branch 'drkloc/master'

Conflicts:
	faq/urls/shallow.py
Version bump to 0.8.5