o Merge branch 'civa' of gitorious.org:acvin/acvindsplugin into civa
o
Merge branch 'civa' of gitorious.org:acvin/acvindsplugin into civa

Conflicts:
	lib/model/DS/client/DSCivaClient.class.php

24eme/CIVA,24eme/CIVA,24eme/CIVA,24eme/CIVA,24eme/CIVA,24eme/CIVA,24eme/CIVA