upgrade play2.1-RC2