conflit will emerge
Merge branch 'master' of https://github.com/tigenie/crm
Few minor changes