Upgrade to Play 2.1.1 and Spring 3.1.4