upgrade to play2.1-RC2