Fixed the non-thread errors
Removed unused imports
Merge branch 'master' into dev

Conflicts:
	base/templates/base.html
	base/templates/site_map.html
	managers/views.py
	threads/templates/view_thread.html