added user activation and fixed email delivery
company activation
Merge branch 'master' of https://github.com/diplay/VisaBlank into alzater