Player State Enum
Player State Enum
Merge branch 'master' into together