Merge pull request #51 from abouffard/master

Fixed the conflicts
Merge pull request #52 from abouffard/master

Fixed order of SymbolSets
Merge pull request #53 from abouffard/master

Fixed batch file to produce Control Measure csv
Merge remote-tracking branch 'upstream/master'