merge
what
working segue for conference
more segue fix and SQL fix
sql + php
committ