Merge pull request #17 from ARTFL-Project/master

merge clovis back
updated fix_drama script
fixed quote values in Query
Merge pull request #200 from rwhaling/master

merge upstream