No more memory leaks. Seolhyun <3
Merge branch 'HuanBranch'
Room fixed. m_Traits is pointer now
Merge branch 'master'