Fixed last Major bug in the conversation window not expanding
Merge branch 'master' of github.com:Rockster160/Capstone