fixing the scroll bar showing up during ng-view transitions
Merge remote-tracking branch 'origin/master'