reorg of Contactable
Merge branch 'devel' of https://github.com/Exartu/Exartu-CRM into devel