added conference updates
Merge pull request #209 from ClareCat/master

added conference updates