fixes in company management and users
Merge branch 'master' of https://github.com/diplay/VisaBlank into alzater