Tmp
Merge remote-tracking branch 'origin/tmp'

Conflicts:
	.coveragerc
	module/about/tests.py
	module/static_page/tests.py
bbcode tag is now in bbcode templatetags
Dealing with soon-to-be-deprecated get_query_set
Clean-up