fix fluid-row
Merge branch 'master' into map-ajax