Merge pull request #56 from confpub/master

FSE session chairs added, co-located events added
AE added
Correction of workshop names