Merge pull request #13 from dbeyer/master

ICSE: better category prefixes, and a typo fix
FORTE schedule added