updated to 2.4
updated to 2.4.1
Merge branch '2.4' into cc-2.3

Conflicts:
	includes/common/widgets.php
	includes/extend/buddypress/groups.php
	includes/forums/template.php
	templates/default/bbpress/form-search.php
	templates/default/css/bbpress.css