merge
Merge branch 'fr_st'
status with pusher,offline time in tooltip and new room with dblclick