player hotfix
Merge branch 'hotfix'
hotfix-2
merge jason
fix multouch
Merge branch 'control'
trap fix
little trap fix
replay button