Upgrade to Play 2.3.6
Merge pull request #6 from benmccann/play-2.3.6

Upgrade to Play 2.3.6