updated to make compatible with Play 2.2.0 (maybe)
updates for Play 2.2.x
changes compatible with Play 2.1.x