[CHANGE] Conference - headline subline
Merge branch 'master', remote-tracking branch 'origin'
[CHANGE] Conference - add speakers - change program