SWC-1274: support layout columns
fix parser and add new test
Merge pull request #8 from jay-hodgson/develop

SWC-1274: support layout columns