Updated modal dialog to use bootstrap-style scrolling
Merge branch 'release' into version3