Added Player and renamed maplevel to room
Merge branch 'HuanBranch'