brought ad hoc conferences back. fixed #688 fixed #367
Merge branch 'development' of https://github.com/siacs/Conversations into development
import fixes