Revert "Revert "updated for play 2.2.1""

This reverts commit 647b092f8f0bcf093b90f7a8bec6386cb6b90ca8.