split up the chat window
merged master into this branch
fixed controller redirect