normalizet company tabi
Merge branch 'master' of https://github.com/DBRisinajumi/d2company

Conflicts:
	controllers/CcmpCompanyController.php
	models/BaseCcucUserCompany.php