Merge pull request #91 from confpub/master

Final ICSE update
ICSE update: added links and one event cancelled