Fix for Play 2.1.1
Merge branch 'feature/playintegration' of https://github.com/jack10/shiny-octopus into feature/playintegration