Merge branch 'master' into 'master'

Marius Cramer

2015-01-08 513a1785121fe98ced58bb0713885926a1ee42a9

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