Merge branch 'develop-olympus' into develop

* develop-olympus:
  [ticket/11094] Add textbox for jabber while memberlist search