Floor class created
Merge branch 'HuanBranch'
Merged with huan