Fixed some affiliations
Merge branch 'master' of https://github.com/fmontesi/acmsac2015-soap