Merge branch 'master' into 'master'

Marius Cramer

2015-08-23 eb1177f61b0299bb011ffc1180e0d3c7fc1e87fc

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