User login & rooms

Fixed Merge issues