merged form
Merge branch 'selfservice' of https://github.com/kimenye/chatcrm into selfservice