Merge branch 'coredev_scarpazi'

Conflicts:
oa2_v0_main/DataFolder/journal.waJournal
oa2_v0_main/Model.js