Modified Room ID
Merge branch '20130823' of https://github.com/gcups/majidesenkyo.git
into 20130823