Merge pull request #152 from dariomanesku/master

Major imgui update.
Fixing scroll bug that was introduced with the previous imgui commit.