Affiliations
Merge branch 'master' of github.com:cwi-swat/ttc2014-fixml-case