Merge pull request #1648 from dereuromark/master

cs corrections
Merge branch 'master' into 2.5

Conflicts:
	lib/Cake/VERSION.txt
Case insensitive validation inList option. Resolves ticket 3521.