Upgrade to Play 2.1

Have upgraded to Play 2.1

Unfortunately there are lots of changes.