Merge branch 'active_crm' of https://github.com/woese/guara
Merge branch 'master' of https://github.com/brunoguerra/guara
merge Guara