Merge Igor Moura
merge Maciel
merge ActiveCRM
Merge branch 'master' of git://github.com/maciel-woese/guara into maciel-woese-master
Merge branch 'active_crm' of https://github.com/woese/guara into active_crm