Updating Spring framework due to CVE-2013-4152
Merge remote-tracking branch 'origin/master'