Update version number to 2.2.5
Fix lint errors.
Merge branch 'master' into 2.3

Conflicts:
	lib/Cake/VERSION.txt