Merge pull request #857 from ahomatthew/develop

more table stuff
meas support fc
Merge pull request #858 from Tendrid/develop

meas support fc
Fix csv excel bug