- rename
Merge branch 'master' of https://github.com/mmonshausen/pac_conference