Merge branch 'master' of github.com:SciLifeLab/facs
Merge branch 'master' of github.com:brainstorm/facs
OpenMP not in OSX, FACS always gets threads=16 even if in the JSON document there are 1,8 and 16... fastqscreen, on the other hand, gets it right
Merge branch 'master' of https://github.com/guillermo-carrasco/facs
Fixes the overwriting of some facs results
Merge pull request #104 from guillermo-carrasco/master

Fix overwriting of some FACS results