Merge branch 'master' into 'master'

Marius Cramer

2014-09-29 178258f86cdf00b9c047023b97937c794bac88ec

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