Upgrading to play 2.3.1
Merge branch 'develop' into feature/matches