Updates.
Merge branch 'master' of https://github.com/idevcoop/ctp-conf-dev