Merge Elam_DB branches & restore licenses to two plotting tools