bumped version to 2.25.rc1
Merge branch '2.25-Jan-11' into FEC-2365

Conflicts:
	includes/DefaultSettings.php