Update PlayActivity #3
Merge remote-tracking branch 'upstream/master'
Update PlayActivity + Layoutorientation #3