Merge branch 'master' into 'master'

Marius Cramer

2015-08-21 98d600f476f4aaf7d4b348ae59e468a96a7801eb

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