Upgrading play framework
Merge branch 'develop' into feature/team-profile