Fix ScrollPane in History, Add id for conversation window
Merge branch 'master' of https://github.com/jkr241/project2