Merge branch 'master', remote-tracking branch 'upstream/master'
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'
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