grid-col-span mixin is shortened to grid-span
detailed explanation for .grid-col-set mixin
Merge branch 'develop'