Merge branch 'master' of https://github.com/o5/grido

Conflicts:
	Grido/Components/Columns/Column.php
	Grido/Grid.latte
Merge branch 'master' of https://github.com/Olicek/grido
Revert "revert commit"

This reverts commit 1e4b967d5e193c191289824ff2f640a310639649.