Server changed to play
Play version functional
Merge branch 'master' into play