Merge pull request #537 from heidiso/develop

SWC-775 Updated table header regex to allow spaces
SWC-805 Fix table parser so single-row tables are parsed by simple parsers
Merge branch 'swc_805' into develop
SWC-805 Clean up code