updated to 2.5.4
Merge branch '2.5' into cc-2.5

Conflicts:
	includes/common/functions.php
	includes/users/template.php
	templates/default/bbpress/user-subscriptions.php