adding CDI
Merge remote-tracking branch 'origin/master'
Adding speakers and talks