Added support for tests using the mask csv files. Deleted temporal 'raw' masks
Merge remote-tracking branch 'upstream/master'