finish adding capability to specify min size for categories
Merge remote-tracking branch 'remotes/origin/category_min_size' into brian

Conflicts:
	www/themes/Default/templates/admin/category-edit.tpl
merge