Merge branch 'master', remote-tracking branch 'upstream/master'
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'
fix error when building archipel-agent rpm due to systemd folder not being in manifest
fix error code at the wrong place
Merge pull request #799 from nicolasochem/fix_rpm_build

Fix rpm build