fixed selectivity case 13
fixed selectivity case 13
testing new iscam ctrl
Merge branch 'IPHC-developer' of https://github.com/smartell/iSCAM into IPHC-developer
stash
Merge branch 'IPHC-developer' of https://github.com/smartell/iSCAM into IPHC-developer
stash
Merge branch 'IPHC-developer' of https://github.com/smartell/iSCAM into IPHC-developer
fixed bug in calcCompositionData in milka
merge with steve's changes