commit before mere
Merge branch 'master' of github.com:SciLifeLab/facs
Merge branch 'master' of github.com:SciLifeLab/facs
provide abs_path for query and filter in JSON report
Merge pull request #101 from tzcoolman/master

fix issue #98
Merge branch 'master' of https://github.com/SciLifeLab/facs
Merge branch 'master' of github.com:brainstorm/facs
Explicit number of threads in a given run, should fix issue #99