Merge branch 'active_crm' of https://github.com/woese/guara
Merge remote-tracking branch 'upstream/master' into active_crm