updates and add
Merge branch 'master' of https://github.com/johntom/crm-MEANS