daniel: stocos cleanup
daniel: stocos mapping categories
Merge branch 'master' of https://github.com/j45ch/icst_cmj_mapping
daniel: stocos mapping conclusions