Block template update
Removed blockname in contentgrid template
Fixed block.ini override settings for contentgrid