WIP: tests passing on refactoring when
WIP: arbitrary JSON names in interface
fixed assets and importing bugs
Ported gams
Merge branch 'master' into when-fixes
Merge pull request #338 from CyberCRI/when-fixes

When fixes