Merge remote-tracking branch 'upstream/master' into chatdx
Move the chatbox to the right when in the tracking station.
Merge remote-tracking branch 'upstream/master' into chatdx
Merge pull request #299 from Jumba/chatdx

Move the chatbox to the right when in the tracking station.