new testing settings
Merge branch 'master' of https://github.com/showkit/conference