Merge branch 'master' into 'master'

Marius Cramer

2015-07-30 a014597671651cdc10f88a2816ea39b9f1451666

1
ALTER TABLE `client` CHANGE `company_id` `company_id` VARCHAR( 255 ) NULL DEFAULT NULL ;