removed grid margin bugfix for bottom toolbar
Merge remote-tracking branch 'origin/master'