Bump up version to 2.5 for next release
New rules for 4th week
Merge branch 'newrules' into 2