Merge branch 'master' into 'master'

Marius Cramer

2015-04-27 13a336cf2c48089c3235a878e299c5244cc48aa9

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