Fix on presence toolbar update
Fix #223: reflect role/affiliation changes in UI

FIXME: This is fucking ugly - refactor.
Merge dev