upgrade to play 2.2.x and minor fixes