Merge branches 'dev' and 'master' into dev
updated
Merge branches 'master' and 'dev'
Merge branch 'master' of https://github.com/isi-metaphor/Metaphor-ADP