some basic player conts and properties
Meger fix player
Merge branch 'master' into HEAD