Merge branch 'master' into develop
fix bug introduced where we subtly shifted to reloading the entire core instead of just one batch - [facepalm]
Merge branch 'fix-reload' of github.com:rwcarlsen/cycamore into rwcarlsen-fix-reload
Merge branch 'rwcarlsen-fix-reload' into develop
updated reflist for v1.1
Updating facilities with some cycic(ui) pragma.
fixed facilitylist to facility and added list to oneormores
incommodity/outcommodity annotation updates