Bump up version to 2.5 for next release
Merge branch 'newrules' into 2
Fix nextCommands