Bug: left/right margin in two col width
Merge branch 'grid_test'
Merge branch 'master' into elastic_v1