update make_room XML and others
Merge branch 'hi_141108' into kt_141108
Stop tracking