Merge branch 'master', remote-tracking branch 'upstream/master'
XMPPServer - Agent : Coding Style
ToolbarXMPPServer - Improved way to populate servers

Keep the last good agent as default
Try to find the best agent with capabilities
And introduce the capabilities system for error handling.
ToolbarXMPPServer - Fix a refresh issue when multiples stanza are send

This avoid to have duplicate entry in the table when multiple IQ
results are received after the UI has been flushed. It avoid to have a
flickering (void) table before refresh.
Fix double dash in some pragma marks definition
Update version of Cappuccino
Merge branch 'master' of https://github.com/ArchipelProject/Archipel
Update version of Cappuccino
Except properly if KSM not available

Signed-off-by: Jonathan Raffre <jonathan.raffre@nekolover.net>
Merge pull request #797 from nekolover/master

Except properly if KSM not available

Reviewed.
Temp bug fix with table view and newer version of Cappuccino
Merge branch 'master' of https://github.com/ArchipelProject/Archipel
Merge remote-tracking branch 'upstream/master'
Update version of Cappuccino
Merge remote-tracking branch 'upstream/master'
introduction of a central agent for archipel
Support for 'display' propery in SRG
Add Display field when creating a SRG
Automatically add admin users in All Users group
Merge remote-tracking branch 'upstream/master'