Fix double dash in some pragma marks definition
Update version of Cappuccino
Merge branch 'master' of https://github.com/ArchipelProject/Archipel