fixed scrollbar issue
solved merge conflicts
merged with develop
Merge pull request #126 from massiveart/refactoring/column-navigation

Fixed scrollbar problem in IE