Make the number of comments shown by default (before expanding) customizable
Merge branch 'customize_default_shown_comment_count'

Conflicts:
	forum/templatetags/node_tags.py