grid footer
merge from master