migrate to play 2.3.0
Merge branch 'develop'