Update FileStorage.php
Update ImageStorage.php
Update UploadValidatorBehavior.php
Merge branch 'develop' into Cake-2.4.1-and-PHP-5.4-compliant

Conflicts:
	Model/ImageStorage.php
Merge branch 'Cake-2.4.1-and-PHP-5.4-compliant' into develop