stash
fixed conflicts
stash
Merge branch 'IPHC-milka-friend' of github.com:smartell/iSCAM into IPHC-milka-friend
stash
Merged Catarina's code