Fixed template issue, now row has its spanX child
Merge branch '0.2.x'