Added conference schedule
Merge remote-tracking branch 'origin/master'
Fixed small html bug