merging company controller uploaded manually
Merge branch 'master' of https://github.com/luis-rp/materialking.com
cometchat setting up
cometchat setting up
Merge branch 'master' of https://github.com/luis-rp/materialking.com
Merge branch 'master' of https://github.com/luis-rp/materialking.com
Merge branch 'master' of https://github.com/luis-rp/materialking.com
Merge branch 'master' of https://github.com/luis-rp/materialking.com
Merge branch 'master' of https://github.com/luis-rp/materialking.com
Merge branch 'master' of https://github.com/luis-rp/materialking.com

Conflicts:
	application/controllers/company.php
Merge branch 'master' of https://github.com/luis-rp/materialking.com
Merge branch 'master' of https://github.com/luis-rp/materialking.com
Merge branch 'master' of https://github.com/luis-rp/materialking.com
Merge branch 'master' of https://github.com/luis-rp/materialking.com
Merge branch 'master' of https://github.com/luis-rp/materialking.com
Merge branch 'master' of https://github.com/luis-rp/materialking.com
Merge branch 'master' of https://github.com/luis-rp/materialking.com
Merge branch 'master' of https://github.com/luis-rp/materialking.com
Merge branch 'master' of https://github.com/luis-rp/materialking.com
Merge branch 'master' of https://github.com/luis-rp/materialking.com