74e2cb Merge remote-tracking branch 'origin/master' into revert_room_feature

Merged and Committed by shun_iwasawa 8 years ago
    Merge remote-tracking branch 'origin/master' into revert_room_feature